Commit 6303b702 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Modifica dashboards, datasources y retoca ajustes 

Elimina dashboard de fluentd, añade nuevo para logging mediante Loki.

Actualiza datasources, quita Elasticsearch y añade Loki.

Permite edición de dashboards pre-aprovisionados y carga de plugins no
firmados.

Renombra variables de volumen.
parent 7dd3df09

deploy/.env

+2 −3
Original line number Diff line number Diff line 
GF_PATHS_DATA=/var/lib/grafana

GF_PATHS_PROVISIONING=/etc/grafana/provisioning

GF_INSTALL_PLUGINS=grafana-clock-panel,grafana-piechart-panel,https://github.com/matschaffer/worldmap-panel/releases/download/0.10.0-pre1/grafana-map-panel-0.10.0-pre1.zip;grafana-map-panel

GF_PLUGINS_ALLOW_LOADING_UNSIGNED_PLUGINS=grafana-map-panel

GF_SERVER_HTTP_PORT=3000

GF_SERVER_ENABLE_GZIP=true

GF_SECURITY_ADMIN_USER=admin
@@ -22,9 +23,7 @@ GF_AUTH_ANONYMOUS_ENABLED=true 


DASHBOARDS_PATH=/etc/grafana/dashboards

PROMETHEUS_URL=http://prometheus:9090

ELASTICSEARCH_URL=http://elasticsearch:9200

ELASTICSEARCH_USER=user

ELASTICSEARCH_PASS=pass

LOKI_URL=http://loki:3100

POSTGRES_URL=db:5432

POSTGRES_USER=user

POSTGRES_PASS=pass

deploy/config/dashboards/elasticsearch-fluentd.json

deleted100644 → 0
+0 −1241

File deleted.

Preview size limit exceeded, changes collapsed.

deploy/config/dashboards/logging-loki.json

0 → 100644
+817 −0

File added.

Preview size limit exceeded, changes collapsed.

deploy/config/dashboards_providers.yml

+1 −1
Original line number Diff line number Diff line
@@ -6,6 +6,6 @@ providers: 
    folder: ''

    type: file

    disableDeletion: false

    editable: true

    allowUiUpdates: true

    options:

      path: ${DASHBOARDS_PATH}

deploy/config/datasources.yml

+5 −16
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ deleteDatasources: 
  - name: Prometheus

    orgId: ${GF_USERS_AUTO_ASSIGN_ORG_ID}



  - name: Elasticsearch-Fluentd

  - name: Loki

    orgId: ${GF_USERS_AUTO_ASSIGN_ORG_ID}



  - name: PostgreSQL
@@ -20,23 +20,12 @@ datasources: 
    version: 1

    editable: true



  - name: Elasticsearch-Fluentd

    type: elasticsearch

  - name: Loki

    type: loki

    access: proxy

    orgId: ${GF_USERS_AUTO_ASSIGN_ORG_ID}

    url: ${ELASTICSEARCH_URL}

    database: '[fluentd-]YYYYMM'

    basicAuth: true

    basicAuthUser: ${ELASTICSEARCH_USER}

    secureJsonData:

      basicAuthPassword: ${ELASTICSEARCH_PASS}

    jsonData:

      timeInterval: 1m

      esVersion: 60

      timeField: '@timestamp'

      interval: Monthly

      logMessageField: log

      logLevelField: source

    url: ${LOKI_URL}

    isDefault: false

    version: 1

    editable: true