Merge branch 'dev' into 'master' (130aaa79) · Commits · REDMIC Project / Metric / Grafana

README.md

+8 −0

Original line number	Diff line number	Diff line
		@@ -15,3 +15,11 @@ When updating a dashboard via JSON Model (copy & paste), you have to pay attenti
		* Set `version` field to current version number of the dashboard you are updating (Grafana will add +1 automatically).

		These values will be different tipically when updating from `dev` to `pro` environment, for example.

		## Embed private dashboard

		If you want to embed a dashboard but it has restricted access, you can use service account authentication.

		This deployment have configuration to expose a pre-authorized endpoint, using service account token at subdomain (set by `${REDMIC_AUTH_TOKEN}`). Endpoint is generated with `${TRAEFIK_SUBDOMAIN}-${REDMIC_AUTH_TOKEN}.${PUBLIC_HOSTNAME}`.

		Using this endpoint, only users who know this token will have access to a restricted dashboard when embedded into any subdomain of `${PUBLIC_HOSTNAME}`.

dashboards/traefik.json

+382 −309

Original line number	Diff line number	Diff line
		@@ -31,7 +31,7 @@
		"liveNow": false,
		"panels": [
		{
		"collapsed": true,
		"collapsed": false,
		"datasource": {
		"type": "prometheus",
		"uid": "PBFA97CFB590B2093"
		@@ -43,7 +43,19 @@
		"y": 0
		},
		"id": 10,
		"panels": [
		"panels": [],
		"targets": [
		{
		"datasource": {
		"type": "prometheus",
		"uid": "PBFA97CFB590B2093"
		},
		"refId": "A"
		}
		],
		"title": "$backend stats",
		"type": "row"
		},
		{
		"datasource": {
		"type": "prometheus",
		@@ -108,7 +120,7 @@
		},
		"textMode": "auto"
		},
		"pluginVersion": "9.1.6",
		"pluginVersion": "10.0.2",
		"targets": [
		{
		"datasource": {
		@@ -125,18 +137,28 @@
		"type": "stat"
		},
		{
		"aliasColors": {},
		"breakPoint": "50%",
		"combine": {
		"label": "Others",
		"threshold": 0
		},
		"datasource": {
		"type": "prometheus",
		"uid": "PBFA97CFB590B2093"
		},
		"fontSize": "80%",
		"format": "short",
		"fieldConfig": {
		"defaults": {
		"color": {
		"mode": "palette-classic"
		},
		"custom": {
		"hideFrom": {
		"legend": false,
		"tooltip": false,
		"viz": false
		}
		},
		"decimals": 0,
		"mappings": [],
		"unit": "short"
		},
		"overrides": []
		},
		"gridPos": {
		"h": 7,
		"w": 8,
		@@ -144,17 +166,32 @@
		"y": 1
		},
		"id": 2,
		"legend": {
		"percentage": true,
		"show": true,
		"values": true
		},
		"legendType": "Right side",
		"links": [],
		"maxDataPoints": 3,
		"nullPointMode": "connected",
		"options": {
		"legend": {
		"calcs": [],
		"displayMode": "table",
		"placement": "right",
		"showLegend": true,
		"values": [
		"value",
		"percent"
		]
		},
		"pieType": "pie",
		"strokeWidth": 1,
		"reduceOptions": {
		"calcs": [
		"lastNotNull"
		],
		"fields": "",
		"values": false
		},
		"tooltip": {
		"mode": "single",
		"sort": "none"
		}
		},
		"targets": [
		{
		"datasource": {
		@@ -169,8 +206,7 @@
		}
		],
		"title": "$backend return code",
		"type": "grafana-piechart-panel",
		"valueName": "current"
		"type": "piechart"
		},
		{
		"datasource": {
		@@ -234,7 +270,7 @@
		},
		"textMode": "auto"
		},
		"pluginVersion": "9.1.6",
		"pluginVersion": "10.0.2",
		"targets": [
		{
		"datasource": {
		@@ -288,7 +324,7 @@
		"alertThreshold": true
		},
		"percentage": false,
		"pluginVersion": "9.1.6",
		"pluginVersion": "10.0.2",
		"pointradius": 5,
		"points": false,
		"renderer": "flot",
		@@ -338,19 +374,6 @@
		"yaxis": {
		"align": false
		}
		}
		],
		"targets": [
		{
		"datasource": {
		"type": "prometheus",
		"uid": "PBFA97CFB590B2093"
		},
		"refId": "A"
		}
		],
		"title": "$backend stats",
		"type": "row"
		},
		{
		"collapsed": false,
		@@ -362,7 +385,7 @@
		"h": 1,
		"w": 24,
		"x": 0,
		"y": 1
		"y": 15
		},
		"id": 12,
		"panels": [],
		@@ -393,7 +416,7 @@
		"h": 7,
		"w": 12,
		"x": 0,
		"y": 2
		"y": 16
		},
		"hiddenSeries": false,
		"id": 5,
		@@ -416,7 +439,7 @@
		"alertThreshold": true
		},
		"percentage": false,
		"pluginVersion": "9.1.6",
		"pluginVersion": "10.0.2",
		"pointradius": 5,
		"points": false,
		"renderer": "flot",
		@@ -482,7 +505,7 @@
		"h": 7,
		"w": 12,
		"x": 12,
		"y": 2
		"y": 16
		},
		"hiddenSeries": false,
		"id": 6,
		@@ -505,7 +528,7 @@
		"alertThreshold": true
		},
		"percentage": false,
		"pluginVersion": "9.1.6",
		"pluginVersion": "10.0.2",
		"pointradius": 5,
		"points": false,
		"renderer": "flot",
		@@ -557,35 +580,60 @@
		}
		},
		{
		"aliasColors": {},
		"breakPoint": "50%",
		"combine": {
		"label": "Others",
		"threshold": 0
		},
		"datasource": {
		"type": "prometheus",
		"uid": "PBFA97CFB590B2093"
		},
		"fontSize": "80%",
		"format": "short",
		"fieldConfig": {
		"defaults": {
		"color": {
		"mode": "palette-classic"
		},
		"custom": {
		"hideFrom": {
		"legend": false,
		"tooltip": false,
		"viz": false
		}
		},
		"decimals": 0,
		"mappings": [],
		"unit": "short"
		},
		"overrides": []
		},
		"gridPos": {
		"h": 7,
		"w": 12,
		"x": 0,
		"y": 9
		"y": 23
		},
		"id": 7,
		"legend": {
		"show": true,
		"values": true
		},
		"legendType": "Right side",
		"links": [],
		"maxDataPoints": 3,
		"nullPointMode": "connected",
		"options": {
		"legend": {
		"calcs": [],
		"displayMode": "table",
		"placement": "right",
		"showLegend": true,
		"values": [
		"value"
		]
		},
		"pieType": "pie",
		"strokeWidth": 1,
		"reduceOptions": {
		"calcs": [
		"sum"
		],
		"fields": "",
		"values": false
		},
		"tooltip": {
		"mode": "single",
		"sort": "none"
		}
		},
		"targets": [
		{
		"datasource": {
		@@ -601,39 +649,63 @@
		}
		],
		"title": "Requests by service",
		"type": "grafana-piechart-panel",
		"valueName": "total"
		"type": "piechart"
		},
		{
		"aliasColors": {},
		"breakPoint": "50%",
		"combine": {
		"label": "Others",
		"threshold": 0
		},
		"datasource": {
		"type": "prometheus",
		"uid": "PBFA97CFB590B2093"
		},
		"fontSize": "80%",
		"format": "short",
		"fieldConfig": {
		"defaults": {
		"color": {
		"mode": "palette-classic"
		},
		"custom": {
		"hideFrom": {
		"legend": false,
		"tooltip": false,
		"viz": false
		}
		},
		"decimals": 0,
		"mappings": [],
		"unit": "short"
		},
		"overrides": []
		},
		"gridPos": {
		"h": 7,
		"w": 12,
		"x": 12,
		"y": 9
		"y": 23
		},
		"id": 8,
		"legend": {
		"show": true,
		"values": true
		},
		"legendType": "Right side",
		"links": [],
		"maxDataPoints": 3,
		"nullPointMode": "connected",
		"options": {
		"legend": {
		"calcs": [],
		"displayMode": "list",
		"placement": "right",
		"showLegend": true,
		"values": [
		"value"
		]
		},
		"pieType": "pie",
		"strokeWidth": 1,
		"reduceOptions": {
		"calcs": [
		"sum"
		],
		"fields": "",
		"values": false
		},
		"tooltip": {
		"mode": "single",
		"sort": "none"
		}
		},
		"targets": [
		{
		"datasource": {
		@@ -649,11 +721,12 @@
		}
		],
		"title": "Requests by protocol",
		"type": "grafana-piechart-panel",
		"valueName": "total"
		"type": "piechart"
		}
		],
		"schemaVersion": 37,
		"refresh": "",
		"revision": 1,
		"schemaVersion": 38,
		"style": "dark",
		"tags": [
		"traefik",
		@@ -664,8 +737,8 @@
		{
		"current": {
		"selected": true,
		"text": "backend-alertmanager",
		"value": "backend-alertmanager"
		"text": "backend-redmic-pro",
		"value": "backend-redmic-pro"
		},
		"datasource": {
		"type": "prometheus",
		@@ -757,6 +830,6 @@
		"timezone": "",
		"title": "Traefik",
		"uid": "qPdAviJmz",
		"version": 2,
		"version": 3,
		"weekStart": ""
		}

deploy/.env

+8 −2

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
		GF_SERVER_HTTP_PORT=3000
		GF_SERVER_ENABLE_GZIP=true
		GF_SECURITY_ADMIN_USER=admin
		GF_SECURITY_ADMIN_PASSWORD=admin
		GF_SECURITY_ALLOW_EMBEDDING=true
		GF_USERS_ALLOW_SIGN_UP=false
		GF_USERS_AUTO_ASSIGN_ORG=true
		GF_USERS_AUTO_ASSIGN_ORG_ID=1
		@@ -19,8 +19,9 @@ GF_SMTP_PASSWORD=pass
		GF_LOG_MODE=console
		GF_LOG_LEVEL=warn
		GF_AUTH_ANONYMOUS_ENABLED=true
		GF_FEATURE_TOGGLES_ENABLE=publicDashboards

		DASHBOARDS_PATH=/etc/grafana/dashboards
		DASHBOARDS_PATH=/var/lib/grafana-dashboards
		PROMETHEUS_URL=http://prometheus:9090
		LOKI_URL=http://loki:3100
		POSTGRES_URL=db:5432
		@@ -28,12 +29,17 @@ POSTGRES_USER=user
		POSTGRES_PASS=pass
		POSTGRES_DB=database

		REDMIC_AUTH_TOKEN=changeme

		TRAEFIK_PROTOCOL=https
		TRAEFIK_ENTRYPOINT=http
		TRAEFIK_SUBDOMAIN=grafana
		PUBLIC_HOSTNAME=localhost

		DATA_VOL_NAME=grafana-vol
		DATA_VOL_DEVICE=:/grafana-vol/
		DASHBOARDS_VOL_NAME=grafana-dashboards-vol
		DASHBOARDS_VOL_DEVICE=:/grafana-dashboards-vol/

		VOL_TYPE=nfs4
		VOL_ADDR=127.0.0.1

deploy/config/dashboards_providers.yml

+1 −0

Original line number	Diff line number	Diff line
		@@ -9,3 +9,4 @@ providers:
		allowUiUpdates: true
		options:
		path: ${DASHBOARDS_PATH}
		foldersFromFilesStructure: true

deploy/docker-compose.dev.yml

+8 −0

Original line number	Diff line number	Diff line
		@@ -8,3 +8,11 @@ volumes:
		type: ${VOL_TYPE}
		o: addr=${VOL_ADDR},${VOL_OPTS}
		device: ${DATA_VOL_DEVICE}

		dashboards-vol:
		name: ${DASHBOARDS_VOL_NAME}
		driver: local
		driver_opts:
		type: ${VOL_TYPE}
		o: addr=${VOL_ADDR},${VOL_OPTS}
		device: ${DASHBOARDS_VOL_DEVICE}