Commit 0a7dd84a authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Merge branch 'dev' into 'master' 

Modifica dashboards, datasources y retoca ajustes

See merge request redmic-project/metric/grafana!5
parents c7edd921 fc7e361f

.gitlab-ci.yml

+1 −5
Original line number Diff line number Diff line
@@ -6,12 +6,8 @@ include: 
stages:

  - deploy



variables:

  PROJECT_PARENT_NAME: metric



.deploy:

  variables:

    STACK: ${PROJECT_PARENT_NAME}

    SERVICES_TO_CHECK: ${PROJECT_PARENT_NAME}_${CI_PROJECT_NAME}

    STACK: metric

  environment:

    url: https://${CI_PROJECT_NAME}.${PUBLIC_HOSTNAME}

deploy/.env

+6 −3
Original line number Diff line number Diff line
@@ -18,12 +18,15 @@ GF_SMTP_USER=user 
GF_SMTP_PASSWORD=pass

GF_LOG_MODE=console

GF_LOG_LEVEL=warn

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

POSTGRES_DB=database



TRAEFIK_PROTOCOL=https

TRAEFIK_SUBDOMAIN=grafana

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
+1139 −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}