Commit 32b0eb6a authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Merge branch 'dev' into 'master' 

Dev

See merge request redmic-project/metric/grafana!6
parents 0a7dd84a dd98cc31

.gitlab-ci.yml

+0 −2
Original line number Diff line number Diff line
@@ -9,5 +9,3 @@ stages: 
.deploy:

  variables:

    STACK: metric
 
  environment:

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

deploy/.env

+6 −0
Original line number Diff line number Diff line
@@ -31,4 +31,10 @@ POSTGRES_DB=database 
TRAEFIK_PROTOCOL=https

TRAEFIK_SUBDOMAIN=grafana

PUBLIC_HOSTNAME=localhost



DATA_VOL_NAME=grafana-vol

DATA_VOL_DEVICE=:/grafana-vol/



VOL_TYPE=nfs4

VOL_ADDR=127.0.0.1

VOL_OPTS=rw,nolock,noatime,tcp,rsize=8192,wsize=8192,timeo=14

deploy/config/dashboards/logging-loki.json

+3 −3
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
  "fiscalYearStartMonth": 0,

  "graphTooltip": 0,

  "id": 20,

  "iteration": 1641892161727,

  "iteration": 1663926754107,

  "links": [],

  "liveNow": false,

  "panels": [
@@ -284,7 +284,7 @@ 
        "showCommonLabels": true,

        "showLabels": true,

        "showTime": true,

        "sortOrder": "Descending",

        "sortOrder": "Ascending",

        "wrapLogMessage": true

      },

      "pluginVersion": "7.2.1",
@@ -1134,6 +1134,6 @@ 
  "timezone": "",

  "title": "Logs",

  "uid": "q8NhPr07k",

  "version": 14,

  "version": 15,

  "weekStart": ""

}

deploy/docker-compose.dev.yml

+4 −4
Original line number Diff line number Diff line 
version: '3.5'

version: '3.9'



volumes:

  data-vol:

    name: ${DATA_VOL_NAME}

    driver: local

    driver_opts:

      type: ${VOL_TYPE:-nfs4}

      o: addr=${VOL_ADDR:-127.0.0.1},${VOL_OPTIONS:-rw,nolock,noatime,tcp,rsize=8192,wsize=8192,timeo=14}

      device: ${DATA_VOL_DEVICE:-:/grafana-vol/}
 
      type: ${VOL_TYPE}

      o: addr=${VOL_ADDR},${VOL_OPTS}

      device: ${DATA_VOL_DEVICE}

deploy/docker-compose.prod.yml

+1 −1
Original line number Diff line number Diff line 
version: '3.5'

version: '3.9'



volumes:

  data-vol: