UNCLASSIFIED - NO CUI

Skip to content
Snippets Groups Projects
Commit cc64263a authored by Matt Vasquez's avatar Matt Vasquez
Browse files

Merge branch '85-bug-grafana-dashboards-may-not-be-compatible-with-thanos' into 'main' 

Resolve "Bug: Grafana dashboards may not be compatible with Thanos"

See merge request !154
parents ecafcd9b f19a4950
No related branches found
No related tags found
1 merge request!154Resolve "Bug: Grafana dashboards may not be compatible with Thanos"
Pipeline #3274521 passed
Stage: ⚙️ configuration validation
Stage: 🤞 package tests
Stage: 📦 package
Stage: 🚀 release
Hide whitespace changes
Inline Side-by-side
CHANGELOG.md
+ 4
− 0
View file @ cc64263a
......@@ -2,6 +2,10 @@
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
## [0.63.0-bb.9] - 2024-05-14
### Changed
- Updated grafana dashboards to work with both prometheus and thanos datasource's
## [0.63.0-bb.8] - 2024-05-13
### Removed
- Removed the kubeversion from chart
......
README.md
+ 1
− 1
View file @ cc64263a
# gitlab-runner
![Version: 0.63.0-bb.8](https://img.shields.io/badge/Version-0.63.0--bb.8-informational?style=flat-square) ![AppVersion: v16.10.0](https://img.shields.io/badge/AppVersion-v16.10.0-informational?style=flat-square)
![Version: 0.63.0-bb.9](https://img.shields.io/badge/Version-0.63.0--bb.9-informational?style=flat-square) ![AppVersion: v16.10.0](https://img.shields.io/badge/AppVersion-v16.10.0-informational?style=flat-square)
GitLab Runner
......
chart/Chart.yaml
+ 1
− 1
View file @ cc64263a
apiVersion: v2
name: gitlab-runner
version: 0.63.0-bb.8
version: 0.63.0-bb.9
appVersion: v16.10.0
description: GitLab Runner
keywords:
......
chart/dashboards/gitlab-ci-pipelines_rev1.json
+ 13
− 13
View file @ cc64263a
......@@ -65,7 +65,7 @@
"links": [],
"panels": [
{
"datasource": "Prometheus",
"datasource": "prometheus",
"fieldConfig": {
"defaults": {
"custom": {}
......@@ -92,7 +92,7 @@
},
{
"cacheTimeout": null,
"datasource": "Prometheus",
"datasource": "prometheus",
"fieldConfig": {
"defaults": {
"custom": {},
......@@ -171,7 +171,7 @@
},
{
"cacheTimeout": null,
"datasource": "Prometheus",
"datasource": "prometheus",
"fieldConfig": {
"defaults": {
"custom": {},
......@@ -254,7 +254,7 @@
},
{
"cacheTimeout": null,
"datasource": "Prometheus",
"datasource": "prometheus",
"fieldConfig": {
"defaults": {
"custom": {},
......@@ -338,7 +338,7 @@
"#d44a3a",
"#4040a0"
],
"datasource": "Prometheus",
"datasource": "prometheus",
"fieldConfig": {
"defaults": {
"custom": {}
......@@ -487,7 +487,7 @@
},
{
"cacheTimeout": null,
"datasource": "Prometheus",
"datasource": "prometheus",
"fieldConfig": {
"defaults": {
"custom": {},
......@@ -570,7 +570,7 @@
},
{
"cacheTimeout": null,
"datasource": "Prometheus",
"datasource": "prometheus",
"fieldConfig": {
"defaults": {
"custom": {},
......@@ -656,7 +656,7 @@
"bars": true,
"dashLength": 10,
"dashes": false,
"datasource": "Prometheus",
"datasource": "prometheus",
"description": "",
"fieldConfig": {
"defaults": {
......@@ -767,7 +767,7 @@
}
},
{
"datasource": "Prometheus",
"datasource": "prometheus",
"fieldConfig": {
"defaults": {
"color": {
......@@ -1073,7 +1073,7 @@
"type": "table"
},
{
"datasource": "Prometheus",
"datasource": "prometheus",
"fieldConfig": {
"defaults": {
"color": {
......@@ -1512,7 +1512,7 @@
{
"allValue": ".*",
"current": {},
"datasource": "Prometheus",
"datasource": "prometheus",
"definition": "label_values(gitlab_ci_pipeline_id, project)",
"error": null,
"hide": 0,
......@@ -1535,7 +1535,7 @@
{
"allValue": ".*",
"current": {},
"datasource": "Prometheus",
"datasource": "prometheus",
"definition": "label_values(gitlab_ci_pipeline_id{project=~\"$OWNER.*\"}, project)",
"error": null,
"hide": 0,
......@@ -1558,7 +1558,7 @@
{
"allValue": ".*",
"current": {},
"datasource": "Prometheus",
"datasource": "prometheus",
"definition": "label_values(gitlab_ci_pipeline_id{project=~\"$PROJECT\"}, ref)",
"error": null,
"hide": 0,
......
chart/dashboards/gitlab-runner-metrics_rev1.json
+ 21
− 21
View file @ cc64263a
......@@ -52,7 +52,7 @@
"links": [],
"panels": [
{
"datasource": "Prometheus",
"datasource": "prometheus",
"gridPos": {
"h": 1,
"w": 24,
......@@ -66,7 +66,7 @@
"type": "row"
},
{
"datasource": "Prometheus",
"datasource": "prometheus",
"fieldConfig": {
"defaults": {
"custom": {}
......@@ -81,7 +81,7 @@
},
"id": 40,
"options": {
"content": "<img src=\"https://about.gitlab.com/images/press/logo/jpg/gitlab-logo-gray-stacked-rgb.jpg\"/>",
"content": "<img src=\"https://images.ctfassets.net/xz1dnu24egyd/3JZABhkTjUT76LCIclV7sH/17a92be9bce78c2adcc43e23aabb7ca1/gitlab-logo-500.svg\"/><h1 style=\"text-align:center;\">GitLab</h1>",
"mode": "html"
},
"pluginVersion": "7.4.2",
......@@ -93,7 +93,7 @@
},
{
"cacheTimeout": null,
"datasource": "Prometheus",
"datasource": "prometheus",
"fieldConfig": {
"defaults": {
"color": {
......@@ -167,7 +167,7 @@
},
{
"cacheTimeout": null,
"datasource": "Prometheus",
"datasource": "prometheus",
"fieldConfig": {
"defaults": {
"color": {
......@@ -241,7 +241,7 @@
},
{
"cacheTimeout": null,
"datasource": "Prometheus",
"datasource": "prometheus",
"description": "",
"fieldConfig": {
"defaults": {
......@@ -315,7 +315,7 @@
},
{
"cacheTimeout": null,
"datasource": "Prometheus",
"datasource": "prometheus",
"description": "",
"fieldConfig": {
"defaults": {
......@@ -389,7 +389,7 @@
},
{
"cacheTimeout": null,
"datasource": "Prometheus",
"datasource": "prometheus",
"description": "",
"fieldConfig": {
"defaults": {
......@@ -463,7 +463,7 @@
},
{
"collapsed": false,
"datasource": "Prometheus",
"datasource": "prometheus",
"gridPos": {
"h": 1,
"w": 24,
......@@ -480,7 +480,7 @@
"bars": true,
"dashLength": 10,
"dashes": false,
"datasource": "Prometheus",
"datasource": "prometheus",
"fieldConfig": {
"defaults": {
"custom": {}
......@@ -589,7 +589,7 @@
"bars": true,
"dashLength": 10,
"dashes": false,
"datasource": "Prometheus",
"datasource": "prometheus",
"fieldConfig": {
"defaults": {
"custom": {}
......@@ -693,7 +693,7 @@
"bars": true,
"dashLength": 10,
"dashes": false,
"datasource": "Prometheus",
"datasource": "prometheus",
"fieldConfig": {
"defaults": {
"custom": {}
......@@ -796,7 +796,7 @@
},
{
"collapsed": false,
"datasource": "Prometheus",
"datasource": "prometheus",
"gridPos": {
"h": 1,
"w": 24,
......@@ -813,7 +813,7 @@
"bars": false,
"dashLength": 10,
"dashes": false,
"datasource": "Prometheus",
"datasource": "prometheus",
"fieldConfig": {
"defaults": {
"custom": {}
......@@ -917,7 +917,7 @@
"bars": false,
"dashLength": 10,
"dashes": false,
"datasource": "Prometheus",
"datasource": "prometheus",
"fieldConfig": {
"defaults": {
"custom": {}
......@@ -1017,7 +1017,7 @@
},
{
"collapsed": false,
"datasource": "Prometheus",
"datasource": "prometheus",
"gridPos": {
"h": 1,
"w": 24,
......@@ -1034,7 +1034,7 @@
"bars": false,
"dashLength": 10,
"dashes": false,
"datasource": "Prometheus",
"datasource": "prometheus",
"decimals": 3,
"fieldConfig": {
"defaults": {
......@@ -1138,7 +1138,7 @@
"bars": false,
"dashLength": 10,
"dashes": false,
"datasource": "Prometheus",
"datasource": "prometheus",
"fieldConfig": {
"defaults": {
"custom": {}
......@@ -1241,7 +1241,7 @@
"bars": false,
"dashLength": 10,
"dashes": false,
"datasource": "Prometheus",
"datasource": "prometheus",
"fieldConfig": {
"defaults": {
"custom": {}
......@@ -1344,7 +1344,7 @@
"bars": false,
"dashLength": 10,
"dashes": false,
"datasource": "Prometheus",
"datasource": "prometheus",
"fieldConfig": {
"defaults": {
"custom": {}
......@@ -1452,7 +1452,7 @@
{
"allValue": null,
"current": {},
"datasource": "Prometheus",
"datasource": "prometheus",
"definition": "label_values(gitlab_runner_api_request_statuses_total, app)",
"description": null,
"error": null,
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

UNCLASSIFIED - NO CUI