Skip to content

Commit

Permalink
fix: add uid fields to Grafana dashboard datasources (#2085)
Browse files Browse the repository at this point in the history 
Signed-off-by: Florian Bacher <florian.bacher@dynatrace.com>
  • Loading branch information
@bacherfl
bacherfl committed Sep 13, 2023
1 parent 469578e commit 4a4af79
Show file tree
Hide file tree
Showing 6 changed files with 203 additions and 184 deletions.
57 changes: 37 additions & 20 deletions dashboards/grafana/configmap/grafana-dashboard-keptn-applications.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,8 @@ data:
"panels": [
{
"datasource": {
"type": "prometheus"
"type": "prometheus",
"uid": "prometheus"
},
"fieldConfig": {
"defaults": {
Expand Down Expand Up @@ -82,8 +83,8 @@ data:
"targets": [
{
"datasource": {
"type": "prometheus"
"type": "prometheus",
"uid": "prometheus"
},
"editorMode": "builder",
"expr": "keptn_app_count_total{keptn_deployment_app_status=\"Succeeded\", keptn_deployment_app_name=\"$Application\"}",
Expand Down Expand Up @@ -117,7 +118,8 @@ data:
},
{
"datasource": {
"type": "prometheus"
"type": "prometheus",
"uid": "prometheus"
},
"fieldConfig": {
"defaults": {
Expand Down Expand Up @@ -165,7 +167,8 @@ data:
"targets": [
{
"datasource": {
"type": "prometheus"
"type": "prometheus",
"uid": "prometheus"
},
"editorMode": "builder",
"expr": "max(keptn_app_active{keptn_deployment_app_name=\"$Application\"})",
Expand All @@ -179,7 +182,8 @@ data:
},
{
"datasource": {
"type": "prometheus"
"type": "prometheus",
"uid": "prometheus"
},
"fieldConfig": {
"defaults": {
Expand Down Expand Up @@ -228,7 +232,8 @@ data:
"targets": [
{
"datasource": {
"type": "prometheus"
"type": "prometheus",
"uid": "prometheus"
},
"editorMode": "builder",
"expr": "keptn_app_count_total{keptn_deployment_app_status=\"Failed\", keptn_deployment_app_name=\"$Application\"}",
Expand Down Expand Up @@ -264,7 +269,8 @@ data:
},
{
"datasource": {
"type": "prometheus"
"type": "prometheus",
"uid": "prometheus"
},
"fieldConfig": {
"defaults": {
Expand Down Expand Up @@ -314,8 +320,8 @@ data:
"targets": [
{
"datasource": {
"type": "prometheus"
"type": "prometheus",
"uid": "prometheus"
},
"editorMode": "builder",
"expr": "avg by(keptn_deployment_app_previousversion, keptn_deployment_app_version) (keptn_app_deploymentinterval{keptn_deployment_app_name=\"$Application\"})",
Expand All @@ -330,7 +336,8 @@ data:
},
{
"datasource": {
"type": "prometheus"
"type": "prometheus",
"uid": "prometheus"
},
"fieldConfig": {
"defaults": {
Expand Down Expand Up @@ -383,7 +390,8 @@ data:
"targets": [
{
"datasource": {
"type": "prometheus"
"type": "prometheus",
"uid": "prometheus"
},
"editorMode": "builder",
"expr": "avg by(keptn_deployment_workload_previousversion) (keptn_app_deploymentinterval{keptn_deployment_app_name=\"$Application\"})",
Expand All @@ -398,7 +406,8 @@ data:
},
{
"datasource": {
"type": "prometheus"
"type": "prometheus",
"uid": "prometheus"
},
"fieldConfig": {
"defaults": {
Expand Down Expand Up @@ -447,7 +456,8 @@ data:
"targets": [
{
"datasource": {
"type": "prometheus"
"type": "prometheus",
"uid": "prometheus"
},
"editorMode": "builder",
"expr": "max by(keptn_deployment_app_version) (keptn_app_deploymentduration{keptn_deployment_app_name=\"$Application\"})",
Expand All @@ -462,7 +472,8 @@ data:
},
{
"datasource": {
"type": "prometheus"
"type": "prometheus",
"uid": "prometheus"
},
"fieldConfig": {
"defaults": {
Expand Down Expand Up @@ -538,7 +549,8 @@ data:
"targets": [
{
"datasource": {
"type": "prometheus"
"type": "prometheus",
"uid": "prometheus"
},
"editorMode": "builder",
"expr": "max(keptn_app_active{keptn_deployment_app_name=\"$Application\"})",
Expand Down Expand Up @@ -605,6 +617,7 @@ data:
{
"datasource": {
"type": "jaeger",
"uid": "jaeger"
},
"operation": "AppPreDeployTasks",
"queryType": "search",
Expand All @@ -618,7 +631,8 @@ data:
},
{
"datasource": {
"type": "prometheus"
"type": "prometheus",
"uid": "prometheus"
},
"fieldConfig": {
"defaults": {
Expand Down Expand Up @@ -681,7 +695,8 @@ data:
"targets": [
{
"datasource": {
"type": "prometheus"
"type": "prometheus",
"uid": "prometheus"
},
"editorMode": "builder",
"expr": "keptn_deployment_deploymentduration{keptn_deployment_app_name=\"$Application\"}",
Expand Down Expand Up @@ -740,7 +755,8 @@ data:
"value": "podtato-head"
},
"datasource": {
"type": "prometheus"
"type": "prometheus",
"uid": "prometheus"
},
"definition": "label_values(keptn_deployment_app_name)",
"hide": 0,
Expand All @@ -760,7 +776,8 @@ data:
},
{
"datasource": {
"type": "prometheus"
"type": "prometheus",
"uid": "prometheus"
},
"filters": [],
"hide": 0,
Expand Down
68 changes: 34 additions & 34 deletions dashboards/grafana/configmap/grafana-dashboard-keptn-overview.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ data:
"panels": [
{
"datasource": {
"type": "prometheus"
"type": "prometheus",
"uid": "prometheus"
},
"fieldConfig": {
"defaults": {
Expand Down Expand Up @@ -110,8 +110,8 @@ data:
"targets": [
{
"datasource": {
"type": "prometheus"
"type": "prometheus",
"uid": "prometheus"
},
"editorMode": "builder",
"expr": "sum by(job) (keptn_task_active{job=\"otel-collector\"})",
Expand All @@ -125,8 +125,8 @@ data:
},
{
"datasource": {
"type": "prometheus"
"type": "prometheus",
"uid": "prometheus"
},
"fieldConfig": {
"defaults": {
Expand Down Expand Up @@ -202,8 +202,8 @@ data:
"targets": [
{
"datasource": {
"type": "prometheus"
"type": "prometheus",
"uid": "prometheus"
},
"editorMode": "builder",
"expr": "sum by(job) (keptn_evaluation_active{job=\"otel-collector\"})",
Expand All @@ -217,8 +217,8 @@ data:
},
{
"datasource": {
"type": "prometheus"
"type": "prometheus",
"uid": "prometheus"
},
"fieldConfig": {
"defaults": {
Expand Down Expand Up @@ -294,8 +294,8 @@ data:
"targets": [
{
"datasource": {
"type": "prometheus"
"type": "prometheus",
"uid": "prometheus"
},
"editorMode": "builder",
"expr": "sum by(job) (keptn_task_count{job=\"otel-collector\"})",
Expand All @@ -309,8 +309,8 @@ data:
},
{
"datasource": {
"type": "prometheus"
"type": "prometheus",
"uid": "prometheus"
},
"fieldConfig": {
"defaults": {
Expand Down Expand Up @@ -386,8 +386,8 @@ data:
"targets": [
{
"datasource": {
"type": "prometheus"
"type": "prometheus",
"uid": "prometheus"
},
"editorMode": "builder",
"expr": "sum by(job) (keptn_evaluation_count_total{job=\"otel-collector\"})",
Expand All @@ -401,8 +401,8 @@ data:
},
{
"datasource": {
"type": "prometheus"
"type": "prometheus",
"uid": "prometheus"
},
"fieldConfig": {
"defaults": {
Expand Down Expand Up @@ -451,8 +451,8 @@ data:
"targets": [
{
"datasource": {
"type": "prometheus"
"type": "prometheus",
"uid": "prometheus"
},
"editorMode": "builder",
"exemplar": false,
Expand Down Expand Up @@ -496,8 +496,8 @@ data:
},
{
"datasource": {
"type": "prometheus"
"type": "prometheus",
"uid": "prometheus"
},
"fieldConfig": {
"defaults": {
Expand Down Expand Up @@ -546,8 +546,8 @@ data:
"targets": [
{
"datasource": {
"type": "prometheus"
"type": "prometheus",
"uid": "prometheus"
},
"editorMode": "builder",
"exemplar": false,
Expand Down Expand Up @@ -591,8 +591,8 @@ data:
},
{
"datasource": {
"type": "prometheus"
"type": "prometheus",
"uid": "prometheus"
},
"fieldConfig": {
"defaults": {
Expand Down Expand Up @@ -668,8 +668,8 @@ data:
"targets": [
{
"datasource": {
"type": "prometheus"
"type": "prometheus",
"uid": "prometheus"
},
"editorMode": "builder",
"expr": "sum by(job) (keptn_deployment_active{job=\"otel-collector\"})",
Expand Down Expand Up @@ -759,8 +759,8 @@ data:
"targets": [
{
"datasource": {
"type": "prometheus"
"type": "prometheus",
"uid": "prometheus"
},
"editorMode": "builder",
"expr": "sum by(job) (keptn_deployment_count{job=\"otel-collector\"})",
Expand All @@ -774,8 +774,8 @@ data:
},
{
"datasource": {
"type": "prometheus"
"type": "prometheus",
"uid": "prometheus"
},
"fieldConfig": {
"defaults": {
Expand Down Expand Up @@ -823,8 +823,8 @@ data:
"targets": [
{
"datasource": {
"type": "prometheus"
"type": "prometheus",
"uid": "prometheus"
},
"editorMode": "builder",
"exemplar": false,
Expand Down
Loading

0 comments on commit 4a4af79

Please sign in to comment.