diff --git a/kubernetes/opentelemetry-demo.yaml b/kubernetes/opentelemetry-demo.yaml index 3e2ca11216..fc1b903ac4 100644 --- a/kubernetes/opentelemetry-demo.yaml +++ b/kubernetes/opentelemetry-demo.yaml @@ -73,8 +73,7 @@ metadata: app.kubernetes.io/part-of: prometheus name: prometheus namespace: otel-demo - annotations: - {} + annotations: {} --- # Source: opentelemetry-demo/templates/serviceaccount.yaml apiVersion: v1 @@ -82,8 +81,6 @@ kind: ServiceAccount metadata: name: opentelemetry-demo labels: - - app.kubernetes.io/version: "2.1.3" app.kubernetes.io/part-of: opentelemetry-demo --- @@ -99,7 +96,6 @@ metadata: app.kubernetes.io/version: "12.1.1" type: Opaque data: - admin-user: "YWRtaW4=" admin-password: "YWRtaW4=" ldap-toml: "" @@ -141,7 +137,6 @@ metadata: app.kubernetes.io/instance: opentelemetry-demo app.kubernetes.io/version: "12.1.1" data: - plugins: grafana-opensearch-datasource grafana.ini: | [analytics] @@ -179,14 +174,14 @@ metadata: data: opensearch.yml: | cluster.name: opensearch-cluster - + # Bind to all interfaces because we don't know what IP address Docker will assign to us. network.host: 0.0.0.0 - + # Setting network.host to a non-loopback address enables the annoying bootstrap checks. "Single-node" mode disables them again. # Implicitly done if ".singleNode" is set to "true". # discovery.type: single-node - + # Start OpenSearch Security Demo Configuration # WARNING: revise all the lines below before you go into production # plugins: @@ -800,12 +795,9 @@ metadata: name: flagd-config namespace: otel-demo labels: - - app.kubernetes.io/version: "2.1.3" app.kubernetes.io/part-of: opentelemetry-demo data: - demo.flagd.json: | { "$schema": "https://flagd.dev/schema/v0/flags.json", @@ -925,14 +917,10 @@ metadata: name: grafana-alerting namespace: otel-demo labels: - - app.kubernetes.io/version: "2.1.3" app.kubernetes.io/part-of: opentelemetry-demo grafana_alert: "1" -data: - - {} +data: {} --- # Source: opentelemetry-demo/templates/grafana-config.yaml apiVersion: v1 @@ -941,8 +929,6 @@ metadata: name: grafana-dashboard-nginx-metrics namespace: otel-demo labels: - - app.kubernetes.io/version: "2.1.3" app.kubernetes.io/part-of: opentelemetry-demo grafana_dashboard: "1" @@ -1297,8 +1283,6 @@ metadata: name: grafana-dashboard-apm-dashboard namespace: otel-demo labels: - - app.kubernetes.io/version: "2.1.3" app.kubernetes.io/part-of: opentelemetry-demo grafana_dashboard: "1" @@ -2564,7 +2548,7 @@ data: }, "disableTextWrap": false, "editorMode": "code", - "expr": "sum by (database) (\n label_join(\n rate(db_client_operation_duration_seconds_count{deployment_environment_name=~\"$deployment_environment_name\", service_namespace=~\"$service_namespace\", service_name=\"$service_name\"}[$__rate_interval]),\n \"database\",\n \"/\",\n \"server_address\",\n \"db_namespace\"\n )\n)\n ", + "expr": "sum by (database) (\n label_join(\n rate({"db.client.operation.duration_count", deployment_environment_name=~\"$deployment_environment_name\", service_namespace=~\"$service_namespace\", service_name=\"$service_name\"}[$__rate_interval]),\n \"database\",\n \"/\",\n \"server_address\",\n \"db_namespace\"\n )\n)\n ", "fullMetaSearch": false, "hide": false, "includeNullMetadata": true, @@ -2580,7 +2564,7 @@ data: "uid": "${prometheus_datasource}" }, "editorMode": "code", - "expr": "(\n sum by (database) (\n label_join(\n rate(db_client_operation_duration_seconds_count{deployment_environment_name=~\"$deployment_environment_name\", service_namespace=~\"$service_namespace\", service_name=\"$service_name\", http_response_status_code=~\"5..\"}[$__rate_interval]),\n \"database\",\n \"/\",\n \"server_address\",\n \"db_namespace\"\n )\n )\n / \n sum by (database) (\n label_join(\n rate(db_client_operation_duration_seconds_count{deployment_environment_name=~\"$deployment_environment_name\", service_namespace=~\"$service_namespace\", service_name=\"$service_name\"}[$__rate_interval]),\n \"database\",\n \"/\",\n \"server_address\",\n \"db_namespace\"\n )\n )\n ) or (0 * \n sum by (database) (\n label_join(\n rate(db_client_operation_duration_seconds_count{deployment_environment_name=~\"$deployment_environment_name\", service_namespace=~\"$service_namespace\", service_name=\"$service_name\"}[$__rate_interval]),\n \"database\",\n \"/\",\n \"server_address\",\n \"db_namespace\"\n )\n )\n )", + "expr": "(\n sum by (database) (\n label_join(\n rate({"db.client.operation.duration_count", deployment_environment_name=~\"$deployment_environment_name\", service_namespace=~\"$service_namespace\", service_name=\"$service_name\", http_response_status_code=~\"5..\"}[$__rate_interval]),\n \"database\",\n \"/\",\n \"server_address\",\n \"db_namespace\"\n )\n )\n / \n sum by (database) (\n label_join(\n rate({"db.client.operation.duration_count", deployment_environment_name=~\"$deployment_environment_name\", service_namespace=~\"$service_namespace\", service_name=\"$service_name\"}[$__rate_interval]),\n \"database\",\n \"/\",\n \"server_address\",\n \"db_namespace\"\n )\n )\n ) or (0 * \n sum by (database) (\n label_join(\n rate({"db.client.operation.duration_count", deployment_environment_name=~\"$deployment_environment_name\", service_namespace=~\"$service_namespace\", service_name=\"$service_name\"}[$__rate_interval]),\n \"database\",\n \"/\",\n \"server_address\",\n \"db_namespace\"\n )\n )\n )", "hide": false, "instant": false, "interval": "60s", @@ -3452,8 +3436,6 @@ metadata: name: grafana-dashboard-demo-dashboard namespace: otel-demo labels: - - app.kubernetes.io/version: "2.1.3" app.kubernetes.io/part-of: opentelemetry-demo grafana_dashboard: "1" @@ -4654,8 +4636,6 @@ metadata: name: grafana-dashboard-exemplars-dashboard namespace: otel-demo labels: - - app.kubernetes.io/version: "2.1.3" app.kubernetes.io/part-of: opentelemetry-demo grafana_dashboard: "1" @@ -5128,8 +5108,6 @@ metadata: name: grafana-dashboard-linux-dashboard namespace: otel-demo labels: - - app.kubernetes.io/version: "2.1.3" app.kubernetes.io/part-of: opentelemetry-demo grafana_dashboard: "1" @@ -7972,8 +7950,6 @@ metadata: name: grafana-dashboard-opentelemetry-collector namespace: otel-demo labels: - - app.kubernetes.io/version: "2.1.3" app.kubernetes.io/part-of: opentelemetry-demo grafana_dashboard: "1" @@ -14305,8 +14281,6 @@ metadata: name: grafana-dashboard-postgresql-dashboard namespace: otel-demo labels: - - app.kubernetes.io/version: "2.1.3" app.kubernetes.io/part-of: opentelemetry-demo grafana_dashboard: "1" @@ -15794,8 +15768,6 @@ metadata: name: grafana-dashboard-spanmetrics-dashboard namespace: otel-demo labels: - - app.kubernetes.io/version: "2.1.3" app.kubernetes.io/part-of: opentelemetry-demo grafana_dashboard: "1" @@ -16843,20 +16815,17 @@ metadata: name: grafana-datasources namespace: otel-demo labels: - - app.kubernetes.io/version: "2.1.3" app.kubernetes.io/part-of: opentelemetry-demo grafana_datasource: "1" data: - default.yaml: | # Copyright The OpenTelemetry Authors # SPDX-License-Identifier: Apache-2.0 - - + + apiVersion: 1 - + datasources: - name: Prometheus uid: webstore-metrics @@ -16870,17 +16839,17 @@ data: exemplarTraceIdDestinations: - datasourceUid: webstore-traces name: trace_id - + - url: http://localhost:8080/jaeger/ui/trace/$${__value.raw} name: trace_id urlDisplayLabel: View in Jaeger UI jaeger.yaml: | # Copyright The OpenTelemetry Authors # SPDX-License-Identifier: Apache-2.0 - - + + apiVersion: 1 - + datasources: - name: Jaeger uid: webstore-traces @@ -16900,9 +16869,9 @@ data: opensearch.yaml: | # Copyright The OpenTelemetry Authors # SPDX-License-Identifier: Apache-2.0 - + apiVersion: 1 - + datasources: - name: OpenSearch uid: webstore-logs @@ -16927,12 +16896,9 @@ metadata: name: product-catalog-products namespace: otel-demo labels: - - app.kubernetes.io/version: "2.1.3" app.kubernetes.io/part-of: opentelemetry-demo data: - products.json: | { "products": [ @@ -17204,9 +17170,9 @@ roleRef: kind: ClusterRole name: otel-collector subjects: -- kind: ServiceAccount - name: otel-collector - namespace: otel-demo + - kind: ServiceAccount + name: otel-collector + namespace: otel-demo --- # Source: opentelemetry-demo/charts/prometheus/templates/clusterrolebinding.yaml apiVersion: rbac.authorization.k8s.io/v1 @@ -17255,9 +17221,9 @@ roleRef: kind: Role name: grafana subjects: -- kind: ServiceAccount - name: grafana - namespace: otel-demo + - kind: ServiceAccount + name: grafana + namespace: otel-demo --- # Source: opentelemetry-demo/charts/grafana/templates/service.yaml apiVersion: v1 @@ -17388,23 +17354,22 @@ metadata: app.kubernetes.io/instance: opentelemetry-demo app.kubernetes.io/version: "3.2.0" app.kubernetes.io/component: opensearch - annotations: - {} + annotations: {} spec: type: ClusterIP selector: app.kubernetes.io/name: opensearch app.kubernetes.io/instance: opentelemetry-demo ports: - - name: http - protocol: TCP - port: 9200 - - name: transport - protocol: TCP - port: 9300 - - name: metrics - protocol: TCP - port: 9600 + - name: http + protocol: TCP + port: 9200 + - name: transport + protocol: TCP + port: 9300 + - name: metrics + protocol: TCP + port: 9600 --- # Source: opentelemetry-demo/charts/opensearch/templates/service.yaml kind: Service @@ -17426,12 +17391,12 @@ spec: app.kubernetes.io/name: opensearch app.kubernetes.io/instance: opentelemetry-demo ports: - - name: http - port: 9200 - - name: transport - port: 9300 - - name: metrics - port: 9600 + - name: http + port: 9200 + - name: transport + port: 9300 + - name: metrics + port: 9600 --- # Source: opentelemetry-demo/charts/opentelemetry-collector/templates/service.yaml apiVersion: v1 @@ -17449,7 +17414,6 @@ metadata: spec: type: ClusterIP ports: - - name: jaeger-compact port: 6831 targetPort: 6831 @@ -17516,9 +17480,8 @@ kind: Service metadata: name: ad labels: - opentelemetry.io/name: ad - + app.kubernetes.io/component: ad app.kubernetes.io/name: ad app.kubernetes.io/version: "2.1.3" @@ -17530,7 +17493,6 @@ spec: name: tcp-service targetPort: 8080 selector: - opentelemetry.io/name: ad --- # Source: opentelemetry-demo/templates/component.yaml @@ -17539,9 +17501,8 @@ kind: Service metadata: name: cart labels: - opentelemetry.io/name: cart - + app.kubernetes.io/component: cart app.kubernetes.io/name: cart app.kubernetes.io/version: "2.1.3" @@ -17553,7 +17514,6 @@ spec: name: tcp-service targetPort: 8080 selector: - opentelemetry.io/name: cart --- # Source: opentelemetry-demo/templates/component.yaml @@ -17562,9 +17522,8 @@ kind: Service metadata: name: checkout labels: - opentelemetry.io/name: checkout - + app.kubernetes.io/component: checkout app.kubernetes.io/name: checkout app.kubernetes.io/version: "2.1.3" @@ -17576,7 +17535,6 @@ spec: name: tcp-service targetPort: 8080 selector: - opentelemetry.io/name: checkout --- # Source: opentelemetry-demo/templates/component.yaml @@ -17585,9 +17543,8 @@ kind: Service metadata: name: currency labels: - opentelemetry.io/name: currency - + app.kubernetes.io/component: currency app.kubernetes.io/name: currency app.kubernetes.io/version: "2.1.3" @@ -17599,7 +17556,6 @@ spec: name: tcp-service targetPort: 8080 selector: - opentelemetry.io/name: currency --- # Source: opentelemetry-demo/templates/component.yaml @@ -17608,9 +17564,8 @@ kind: Service metadata: name: email labels: - opentelemetry.io/name: email - + app.kubernetes.io/component: email app.kubernetes.io/name: email app.kubernetes.io/version: "2.1.3" @@ -17622,7 +17577,6 @@ spec: name: tcp-service targetPort: 8080 selector: - opentelemetry.io/name: email --- # Source: opentelemetry-demo/templates/component.yaml @@ -17631,9 +17585,8 @@ kind: Service metadata: name: flagd labels: - opentelemetry.io/name: flagd - + app.kubernetes.io/component: flagd app.kubernetes.io/name: flagd app.kubernetes.io/version: "2.1.3" @@ -17651,7 +17604,6 @@ spec: name: tcp-service-0 targetPort: 4000 selector: - opentelemetry.io/name: flagd --- # Source: opentelemetry-demo/templates/component.yaml @@ -17660,9 +17612,8 @@ kind: Service metadata: name: frontend labels: - opentelemetry.io/name: frontend - + app.kubernetes.io/component: frontend app.kubernetes.io/name: frontend app.kubernetes.io/version: "2.1.3" @@ -17674,7 +17625,6 @@ spec: name: tcp-service targetPort: 8080 selector: - opentelemetry.io/name: frontend --- # Source: opentelemetry-demo/templates/component.yaml @@ -17683,9 +17633,8 @@ kind: Service metadata: name: frontend-proxy labels: - opentelemetry.io/name: frontend-proxy - + app.kubernetes.io/component: frontend-proxy app.kubernetes.io/name: frontend-proxy app.kubernetes.io/version: "2.1.3" @@ -17697,7 +17646,6 @@ spec: name: tcp-service targetPort: 8080 selector: - opentelemetry.io/name: frontend-proxy --- # Source: opentelemetry-demo/templates/component.yaml @@ -17706,9 +17654,8 @@ kind: Service metadata: name: image-provider labels: - opentelemetry.io/name: image-provider - + app.kubernetes.io/component: image-provider app.kubernetes.io/name: image-provider app.kubernetes.io/version: "2.1.3" @@ -17720,7 +17667,6 @@ spec: name: tcp-service targetPort: 8081 selector: - opentelemetry.io/name: image-provider --- # Source: opentelemetry-demo/templates/component.yaml @@ -17729,9 +17675,8 @@ kind: Service metadata: name: kafka labels: - opentelemetry.io/name: kafka - + app.kubernetes.io/component: kafka app.kubernetes.io/name: kafka app.kubernetes.io/version: "2.1.3" @@ -17746,7 +17691,6 @@ spec: name: controller targetPort: 9093 selector: - opentelemetry.io/name: kafka --- # Source: opentelemetry-demo/templates/component.yaml @@ -17755,9 +17699,8 @@ kind: Service metadata: name: load-generator labels: - opentelemetry.io/name: load-generator - + app.kubernetes.io/component: load-generator app.kubernetes.io/name: load-generator app.kubernetes.io/version: "2.1.3" @@ -17769,7 +17712,6 @@ spec: name: tcp-service targetPort: 8089 selector: - opentelemetry.io/name: load-generator --- # Source: opentelemetry-demo/templates/component.yaml @@ -17778,9 +17720,8 @@ kind: Service metadata: name: payment labels: - opentelemetry.io/name: payment - + app.kubernetes.io/component: payment app.kubernetes.io/name: payment app.kubernetes.io/version: "2.1.3" @@ -17792,7 +17733,6 @@ spec: name: tcp-service targetPort: 8080 selector: - opentelemetry.io/name: payment --- # Source: opentelemetry-demo/templates/component.yaml @@ -17801,9 +17741,8 @@ kind: Service metadata: name: postgresql labels: - opentelemetry.io/name: postgresql - + app.kubernetes.io/component: postgresql app.kubernetes.io/name: postgresql app.kubernetes.io/version: "2.1.3" @@ -17815,7 +17754,6 @@ spec: name: tcp-service targetPort: 5432 selector: - opentelemetry.io/name: postgresql --- # Source: opentelemetry-demo/templates/component.yaml @@ -17824,9 +17762,8 @@ kind: Service metadata: name: product-catalog labels: - opentelemetry.io/name: product-catalog - + app.kubernetes.io/component: product-catalog app.kubernetes.io/name: product-catalog app.kubernetes.io/version: "2.1.3" @@ -17838,7 +17775,6 @@ spec: name: tcp-service targetPort: 8080 selector: - opentelemetry.io/name: product-catalog --- # Source: opentelemetry-demo/templates/component.yaml @@ -17847,9 +17783,8 @@ kind: Service metadata: name: quote labels: - opentelemetry.io/name: quote - + app.kubernetes.io/component: quote app.kubernetes.io/name: quote app.kubernetes.io/version: "2.1.3" @@ -17861,7 +17796,6 @@ spec: name: tcp-service targetPort: 8080 selector: - opentelemetry.io/name: quote --- # Source: opentelemetry-demo/templates/component.yaml @@ -17870,9 +17804,8 @@ kind: Service metadata: name: recommendation labels: - opentelemetry.io/name: recommendation - + app.kubernetes.io/component: recommendation app.kubernetes.io/name: recommendation app.kubernetes.io/version: "2.1.3" @@ -17884,7 +17817,6 @@ spec: name: tcp-service targetPort: 8080 selector: - opentelemetry.io/name: recommendation --- # Source: opentelemetry-demo/templates/component.yaml @@ -17893,9 +17825,8 @@ kind: Service metadata: name: shipping labels: - opentelemetry.io/name: shipping - + app.kubernetes.io/component: shipping app.kubernetes.io/name: shipping app.kubernetes.io/version: "2.1.3" @@ -17907,7 +17838,6 @@ spec: name: tcp-service targetPort: 8080 selector: - opentelemetry.io/name: shipping --- # Source: opentelemetry-demo/templates/component.yaml @@ -17916,9 +17846,8 @@ kind: Service metadata: name: valkey-cart labels: - opentelemetry.io/name: valkey-cart - + app.kubernetes.io/component: valkey-cart app.kubernetes.io/name: valkey-cart app.kubernetes.io/version: "2.1.3" @@ -17930,7 +17859,6 @@ spec: name: valkey-cart targetPort: 6379 selector: - opentelemetry.io/name: valkey-cart --- # Source: opentelemetry-demo/charts/grafana/templates/deployment.yaml @@ -17964,7 +17892,6 @@ spec: checksum/secret: bed677784356b2af7fb0d87455db21f077853059b594101a4f6532bfbd962a7f kubectl.kubernetes.io/default-container: grafana spec: - serviceAccountName: grafana automountServiceAccountToken: true shareProcessNamespace: false @@ -18009,7 +17936,7 @@ spec: allowPrivilegeEscalation: false capabilities: drop: - - ALL + - ALL seccompProfile: type: RuntimeDefault volumeMounts: @@ -18049,7 +17976,7 @@ spec: allowPrivilegeEscalation: false capabilities: drop: - - ALL + - ALL seccompProfile: type: RuntimeDefault volumeMounts: @@ -18089,7 +18016,7 @@ spec: allowPrivilegeEscalation: false capabilities: drop: - - ALL + - ALL seccompProfile: type: RuntimeDefault volumeMounts: @@ -18102,7 +18029,7 @@ spec: allowPrivilegeEscalation: false capabilities: drop: - - ALL + - ALL seccompProfile: type: RuntimeDefault volumeMounts: @@ -18227,7 +18154,6 @@ spec: prometheus.io/port: "14269" prometheus.io/scrape: "true" spec: - containers: - env: - name: METRICS_STORAGE_TYPE @@ -18238,15 +18164,14 @@ spec: value: 0.0.0.0:4318 - name: SPAN_STORAGE_TYPE value: memory - + - name: COLLECTOR_ZIPKIN_HOST_PORT value: :9411 - name: JAEGER_DISABLED value: "false" - name: COLLECTOR_OTLP_ENABLED value: "true" - securityContext: - {} + securityContext: {} image: jaegertracing/all-in-one:1.53.0 imagePullPolicy: IfNotPresent name: jaeger @@ -18338,23 +18263,19 @@ spec: app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: opentelemetry-demo component: standalone-collector - + spec: - serviceAccountName: otel-collector automountServiceAccountToken: true - securityContext: - {} + securityContext: {} containers: - name: opentelemetry-collector args: - --config=/conf/relay.yaml - securityContext: - {} + securityContext: {} image: "otel/opentelemetry-collector-contrib:0.135.0" imagePullPolicy: IfNotPresent ports: - - name: jaeger-compact containerPort: 6831 protocol: UDP @@ -18442,7 +18363,6 @@ spec: enableServiceLinks: true serviceAccountName: prometheus containers: - - name: prometheus-server image: "quay.io/prometheus/prometheus:v3.6.0" imagePullPolicy: "IfNotPresent" @@ -18497,8 +18417,7 @@ spec: configMap: name: prometheus - name: storage-volume - emptyDir: - {} + emptyDir: {} --- # Source: opentelemetry-demo/templates/component.yaml apiVersion: apps/v1 @@ -18506,9 +18425,8 @@ kind: Deployment metadata: name: accounting labels: - opentelemetry.io/name: accounting - + app.kubernetes.io/component: accounting app.kubernetes.io/name: accounting app.kubernetes.io/version: "2.1.3" @@ -18518,21 +18436,19 @@ spec: revisionHistoryLimit: 10 selector: matchLabels: - opentelemetry.io/name: accounting template: metadata: labels: - opentelemetry.io/name: accounting - + app.kubernetes.io/component: accounting app.kubernetes.io/name: accounting spec: serviceAccountName: opentelemetry-demo containers: - name: accounting - image: 'ghcr.io/open-telemetry/demo:2.1.3-accounting' + image: "ghcr.io/open-telemetry/demo:2.1.3-accounting" imagePullPolicy: IfNotPresent env: - name: OTEL_SERVICE_NAME @@ -18560,9 +18476,9 @@ spec: volumeMounts: initContainers: - command: - - sh - - -c - - until nc -z -v -w30 kafka 9092; do echo waiting for kafka; sleep 2; done; + - sh + - -c + - until nc -z -v -w30 kafka 9092; do echo waiting for kafka; sleep 2; done; image: busybox:latest name: wait-for-kafka volumes: @@ -18573,9 +18489,8 @@ kind: Deployment metadata: name: ad labels: - opentelemetry.io/name: ad - + app.kubernetes.io/component: ad app.kubernetes.io/name: ad app.kubernetes.io/version: "2.1.3" @@ -18585,24 +18500,21 @@ spec: revisionHistoryLimit: 10 selector: matchLabels: - opentelemetry.io/name: ad template: metadata: labels: - opentelemetry.io/name: ad - + app.kubernetes.io/component: ad app.kubernetes.io/name: ad spec: serviceAccountName: opentelemetry-demo containers: - name: ad - image: 'ghcr.io/open-telemetry/demo:2.1.3-ad' + image: "ghcr.io/open-telemetry/demo:2.1.3-ad" imagePullPolicy: IfNotPresent ports: - - containerPort: 8080 name: service env: @@ -18639,9 +18551,8 @@ kind: Deployment metadata: name: cart labels: - opentelemetry.io/name: cart - + app.kubernetes.io/component: cart app.kubernetes.io/name: cart app.kubernetes.io/version: "2.1.3" @@ -18651,24 +18562,21 @@ spec: revisionHistoryLimit: 10 selector: matchLabels: - opentelemetry.io/name: cart template: metadata: labels: - opentelemetry.io/name: cart - + app.kubernetes.io/component: cart app.kubernetes.io/name: cart spec: serviceAccountName: opentelemetry-demo containers: - name: cart - image: 'ghcr.io/open-telemetry/demo:2.1.3-cart' + image: "ghcr.io/open-telemetry/demo:2.1.3-cart" imagePullPolicy: IfNotPresent ports: - - containerPort: 8080 name: service env: @@ -18701,10 +18609,10 @@ spec: volumeMounts: initContainers: - command: - - sh - - -c - - until nc -z -v -w30 valkey-cart 6379; do echo waiting for valkey-cart; sleep 2; - done; + - sh + - -c + - until nc -z -v -w30 valkey-cart 6379; do echo waiting for valkey-cart; sleep 2; + done; image: busybox:latest name: wait-for-valkey-cart volumes: @@ -18715,9 +18623,8 @@ kind: Deployment metadata: name: checkout labels: - opentelemetry.io/name: checkout - + app.kubernetes.io/component: checkout app.kubernetes.io/name: checkout app.kubernetes.io/version: "2.1.3" @@ -18727,24 +18634,21 @@ spec: revisionHistoryLimit: 10 selector: matchLabels: - opentelemetry.io/name: checkout template: metadata: labels: - opentelemetry.io/name: checkout - + app.kubernetes.io/component: checkout app.kubernetes.io/name: checkout spec: serviceAccountName: opentelemetry-demo containers: - name: checkout - image: 'ghcr.io/open-telemetry/demo:2.1.3-checkout' + image: "ghcr.io/open-telemetry/demo:2.1.3-checkout" imagePullPolicy: IfNotPresent ports: - - containerPort: 8080 name: service env: @@ -18789,9 +18693,9 @@ spec: volumeMounts: initContainers: - command: - - sh - - -c - - until nc -z -v -w30 kafka 9092; do echo waiting for kafka; sleep 2; done; + - sh + - -c + - until nc -z -v -w30 kafka 9092; do echo waiting for kafka; sleep 2; done; image: busybox:latest name: wait-for-kafka volumes: @@ -18802,9 +18706,8 @@ kind: Deployment metadata: name: currency labels: - opentelemetry.io/name: currency - + app.kubernetes.io/component: currency app.kubernetes.io/name: currency app.kubernetes.io/version: "2.1.3" @@ -18814,24 +18717,21 @@ spec: revisionHistoryLimit: 10 selector: matchLabels: - opentelemetry.io/name: currency template: metadata: labels: - opentelemetry.io/name: currency - + app.kubernetes.io/component: currency app.kubernetes.io/name: currency spec: serviceAccountName: opentelemetry-demo containers: - name: currency - image: 'ghcr.io/open-telemetry/demo:2.1.3-currency' + image: "ghcr.io/open-telemetry/demo:2.1.3-currency" imagePullPolicy: IfNotPresent ports: - - containerPort: 8080 name: service env: @@ -18849,7 +18749,7 @@ spec: - name: OTEL_EXPORTER_OTLP_ENDPOINT value: http://$(OTEL_COLLECTOR_NAME):4317 - name: VERSION - value: '2.1.3' + value: "2.1.3" - name: OTEL_RESOURCE_ATTRIBUTES value: service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version=2.1.3 resources: @@ -18864,9 +18764,8 @@ kind: Deployment metadata: name: email labels: - opentelemetry.io/name: email - + app.kubernetes.io/component: email app.kubernetes.io/name: email app.kubernetes.io/version: "2.1.3" @@ -18876,24 +18775,21 @@ spec: revisionHistoryLimit: 10 selector: matchLabels: - opentelemetry.io/name: email template: metadata: labels: - opentelemetry.io/name: email - + app.kubernetes.io/component: email app.kubernetes.io/name: email spec: serviceAccountName: opentelemetry-demo containers: - name: email - image: 'ghcr.io/open-telemetry/demo:2.1.3-email' + image: "ghcr.io/open-telemetry/demo:2.1.3-email" imagePullPolicy: IfNotPresent ports: - - containerPort: 8080 name: service env: @@ -18930,9 +18826,8 @@ kind: Deployment metadata: name: flagd labels: - opentelemetry.io/name: flagd - + app.kubernetes.io/component: flagd app.kubernetes.io/name: flagd app.kubernetes.io/version: "2.1.3" @@ -18942,21 +18837,19 @@ spec: revisionHistoryLimit: 10 selector: matchLabels: - opentelemetry.io/name: flagd template: metadata: labels: - opentelemetry.io/name: flagd - + app.kubernetes.io/component: flagd app.kubernetes.io/name: flagd spec: serviceAccountName: opentelemetry-demo containers: - name: flagd - image: 'ghcr.io/open-feature/flagd:v0.12.8' + image: "ghcr.io/open-feature/flagd:v0.12.8" imagePullPolicy: IfNotPresent command: - /flagd-build @@ -18968,7 +18861,6 @@ spec: - --uri - file:./etc/flagd/demo.flagd.json ports: - - containerPort: 8013 name: rpc - containerPort: 8016 @@ -18998,10 +18890,9 @@ spec: - name: config-rw mountPath: /etc/flagd - name: flagd-ui - image: 'ghcr.io/open-telemetry/demo:2.1.3-flagd-ui' + image: "ghcr.io/open-telemetry/demo:2.1.3-flagd-ui" imagePullPolicy: IfNotPresent ports: - - containerPort: 4000 name: service env: @@ -19034,16 +18925,16 @@ spec: name: config-rw initContainers: - command: - - sh - - -c - - cp /config-ro/demo.flagd.json /config-rw/demo.flagd.json && cat /config-rw/demo.flagd.json + - sh + - -c + - cp /config-ro/demo.flagd.json /config-rw/demo.flagd.json && cat /config-rw/demo.flagd.json image: busybox name: init-config volumeMounts: - - mountPath: /config-ro - name: config-ro - - mountPath: /config-rw - name: config-rw + - mountPath: /config-ro + name: config-ro + - mountPath: /config-rw + name: config-rw volumes: - name: config-rw emptyDir: {} @@ -19057,9 +18948,8 @@ kind: Deployment metadata: name: fraud-detection labels: - opentelemetry.io/name: fraud-detection - + app.kubernetes.io/component: fraud-detection app.kubernetes.io/name: fraud-detection app.kubernetes.io/version: "2.1.3" @@ -19069,21 +18959,19 @@ spec: revisionHistoryLimit: 10 selector: matchLabels: - opentelemetry.io/name: fraud-detection template: metadata: labels: - opentelemetry.io/name: fraud-detection - + app.kubernetes.io/component: fraud-detection app.kubernetes.io/name: fraud-detection spec: serviceAccountName: opentelemetry-demo containers: - name: fraud-detection - image: 'ghcr.io/open-telemetry/demo:2.1.3-fraud-detection' + image: "ghcr.io/open-telemetry/demo:2.1.3-fraud-detection" imagePullPolicy: IfNotPresent env: - name: OTEL_SERVICE_NAME @@ -19115,9 +19003,9 @@ spec: volumeMounts: initContainers: - command: - - sh - - -c - - until nc -z -v -w30 kafka 9092; do echo waiting for kafka; sleep 2; done; + - sh + - -c + - until nc -z -v -w30 kafka 9092; do echo waiting for kafka; sleep 2; done; image: busybox:latest name: wait-for-kafka volumes: @@ -19128,9 +19016,8 @@ kind: Deployment metadata: name: frontend labels: - opentelemetry.io/name: frontend - + app.kubernetes.io/component: frontend app.kubernetes.io/name: frontend app.kubernetes.io/version: "2.1.3" @@ -19140,24 +19027,21 @@ spec: revisionHistoryLimit: 10 selector: matchLabels: - opentelemetry.io/name: frontend template: metadata: labels: - opentelemetry.io/name: frontend - + app.kubernetes.io/component: frontend app.kubernetes.io/name: frontend spec: serviceAccountName: opentelemetry-demo containers: - name: frontend - image: 'ghcr.io/open-telemetry/demo:2.1.3-frontend' + image: "ghcr.io/open-telemetry/demo:2.1.3-frontend" imagePullPolicy: IfNotPresent ports: - - containerPort: 8080 name: service env: @@ -19222,9 +19106,8 @@ kind: Deployment metadata: name: frontend-proxy labels: - opentelemetry.io/name: frontend-proxy - + app.kubernetes.io/component: frontend-proxy app.kubernetes.io/name: frontend-proxy app.kubernetes.io/version: "2.1.3" @@ -19234,24 +19117,21 @@ spec: revisionHistoryLimit: 10 selector: matchLabels: - opentelemetry.io/name: frontend-proxy template: metadata: labels: - opentelemetry.io/name: frontend-proxy - + app.kubernetes.io/component: frontend-proxy app.kubernetes.io/name: frontend-proxy spec: serviceAccountName: opentelemetry-demo containers: - name: frontend-proxy - image: 'ghcr.io/open-telemetry/demo:2.1.3-frontend-proxy' + image: "ghcr.io/open-telemetry/demo:2.1.3-frontend-proxy" imagePullPolicy: IfNotPresent ports: - - containerPort: 8080 name: service env: @@ -19320,9 +19200,8 @@ kind: Deployment metadata: name: image-provider labels: - opentelemetry.io/name: image-provider - + app.kubernetes.io/component: image-provider app.kubernetes.io/name: image-provider app.kubernetes.io/version: "2.1.3" @@ -19332,24 +19211,21 @@ spec: revisionHistoryLimit: 10 selector: matchLabels: - opentelemetry.io/name: image-provider template: metadata: labels: - opentelemetry.io/name: image-provider - + app.kubernetes.io/component: image-provider app.kubernetes.io/name: image-provider spec: serviceAccountName: opentelemetry-demo containers: - name: image-provider - image: 'ghcr.io/open-telemetry/demo:2.1.3-image-provider' + image: "ghcr.io/open-telemetry/demo:2.1.3-image-provider" imagePullPolicy: IfNotPresent ports: - - containerPort: 8081 name: service env: @@ -19382,9 +19258,8 @@ kind: Deployment metadata: name: kafka labels: - opentelemetry.io/name: kafka - + app.kubernetes.io/component: kafka app.kubernetes.io/name: kafka app.kubernetes.io/version: "2.1.3" @@ -19394,24 +19269,21 @@ spec: revisionHistoryLimit: 10 selector: matchLabels: - opentelemetry.io/name: kafka template: metadata: labels: - opentelemetry.io/name: kafka - + app.kubernetes.io/component: kafka app.kubernetes.io/name: kafka spec: serviceAccountName: opentelemetry-demo containers: - name: kafka - image: 'ghcr.io/open-telemetry/demo:2.1.3-kafka' + image: "ghcr.io/open-telemetry/demo:2.1.3-kafka" imagePullPolicy: IfNotPresent ports: - - containerPort: 9092 name: plaintext - containerPort: 9093 @@ -19456,9 +19328,8 @@ kind: Deployment metadata: name: load-generator labels: - opentelemetry.io/name: load-generator - + app.kubernetes.io/component: load-generator app.kubernetes.io/name: load-generator app.kubernetes.io/version: "2.1.3" @@ -19468,24 +19339,21 @@ spec: revisionHistoryLimit: 10 selector: matchLabels: - opentelemetry.io/name: load-generator template: metadata: labels: - opentelemetry.io/name: load-generator - + app.kubernetes.io/component: load-generator app.kubernetes.io/name: load-generator spec: serviceAccountName: opentelemetry-demo containers: - name: load-generator - image: 'ghcr.io/open-telemetry/demo:2.1.3-load-generator' + image: "ghcr.io/open-telemetry/demo:2.1.3-load-generator" imagePullPolicy: IfNotPresent ports: - - containerPort: 8089 name: service env: @@ -19538,9 +19406,8 @@ kind: Deployment metadata: name: payment labels: - opentelemetry.io/name: payment - + app.kubernetes.io/component: payment app.kubernetes.io/name: payment app.kubernetes.io/version: "2.1.3" @@ -19550,24 +19417,21 @@ spec: revisionHistoryLimit: 10 selector: matchLabels: - opentelemetry.io/name: payment template: metadata: labels: - opentelemetry.io/name: payment - + app.kubernetes.io/component: payment app.kubernetes.io/name: payment spec: serviceAccountName: opentelemetry-demo containers: - name: payment - image: 'ghcr.io/open-telemetry/demo:2.1.3-payment' + image: "ghcr.io/open-telemetry/demo:2.1.3-payment" imagePullPolicy: IfNotPresent ports: - - containerPort: 8080 name: service env: @@ -19606,9 +19470,8 @@ kind: Deployment metadata: name: postgresql labels: - opentelemetry.io/name: postgresql - + app.kubernetes.io/component: postgresql app.kubernetes.io/name: postgresql app.kubernetes.io/version: "2.1.3" @@ -19618,24 +19481,21 @@ spec: revisionHistoryLimit: 10 selector: matchLabels: - opentelemetry.io/name: postgresql template: metadata: labels: - opentelemetry.io/name: postgresql - + app.kubernetes.io/component: postgresql app.kubernetes.io/name: postgresql spec: serviceAccountName: opentelemetry-demo containers: - name: postgresql - image: 'ghcr.io/open-telemetry/demo:2.1.3-postgresql' + image: "ghcr.io/open-telemetry/demo:2.1.3-postgresql" imagePullPolicy: IfNotPresent ports: - - containerPort: 5432 name: service env: @@ -19668,9 +19528,8 @@ kind: Deployment metadata: name: product-catalog labels: - opentelemetry.io/name: product-catalog - + app.kubernetes.io/component: product-catalog app.kubernetes.io/name: product-catalog app.kubernetes.io/version: "2.1.3" @@ -19680,24 +19539,21 @@ spec: revisionHistoryLimit: 10 selector: matchLabels: - opentelemetry.io/name: product-catalog template: metadata: labels: - opentelemetry.io/name: product-catalog - + app.kubernetes.io/component: product-catalog app.kubernetes.io/name: product-catalog spec: serviceAccountName: opentelemetry-demo containers: - name: product-catalog - image: 'ghcr.io/open-telemetry/demo:2.1.3-product-catalog' + image: "ghcr.io/open-telemetry/demo:2.1.3-product-catalog" imagePullPolicy: IfNotPresent ports: - - containerPort: 8080 name: service env: @@ -19741,9 +19597,8 @@ kind: Deployment metadata: name: quote labels: - opentelemetry.io/name: quote - + app.kubernetes.io/component: quote app.kubernetes.io/name: quote app.kubernetes.io/version: "2.1.3" @@ -19753,24 +19608,21 @@ spec: revisionHistoryLimit: 10 selector: matchLabels: - opentelemetry.io/name: quote template: metadata: labels: - opentelemetry.io/name: quote - + app.kubernetes.io/component: quote app.kubernetes.io/name: quote spec: serviceAccountName: opentelemetry-demo containers: - name: quote - image: 'ghcr.io/open-telemetry/demo:2.1.3-quote' + image: "ghcr.io/open-telemetry/demo:2.1.3-quote" imagePullPolicy: IfNotPresent ports: - - containerPort: 8080 name: service env: @@ -19809,9 +19661,8 @@ kind: Deployment metadata: name: recommendation labels: - opentelemetry.io/name: recommendation - + app.kubernetes.io/component: recommendation app.kubernetes.io/name: recommendation app.kubernetes.io/version: "2.1.3" @@ -19821,24 +19672,21 @@ spec: revisionHistoryLimit: 10 selector: matchLabels: - opentelemetry.io/name: recommendation template: metadata: labels: - opentelemetry.io/name: recommendation - + app.kubernetes.io/component: recommendation app.kubernetes.io/name: recommendation spec: serviceAccountName: opentelemetry-demo containers: - name: recommendation - image: 'ghcr.io/open-telemetry/demo:2.1.3-recommendation' + image: "ghcr.io/open-telemetry/demo:2.1.3-recommendation" imagePullPolicy: IfNotPresent ports: - - containerPort: 8080 name: service env: @@ -19879,9 +19727,8 @@ kind: Deployment metadata: name: shipping labels: - opentelemetry.io/name: shipping - + app.kubernetes.io/component: shipping app.kubernetes.io/name: shipping app.kubernetes.io/version: "2.1.3" @@ -19891,24 +19738,21 @@ spec: revisionHistoryLimit: 10 selector: matchLabels: - opentelemetry.io/name: shipping template: metadata: labels: - opentelemetry.io/name: shipping - + app.kubernetes.io/component: shipping app.kubernetes.io/name: shipping spec: serviceAccountName: opentelemetry-demo containers: - name: shipping - image: 'ghcr.io/open-telemetry/demo:2.1.3-shipping' + image: "ghcr.io/open-telemetry/demo:2.1.3-shipping" imagePullPolicy: IfNotPresent ports: - - containerPort: 8080 name: service env: @@ -19941,9 +19785,8 @@ kind: Deployment metadata: name: valkey-cart labels: - opentelemetry.io/name: valkey-cart - + app.kubernetes.io/component: valkey-cart app.kubernetes.io/name: valkey-cart app.kubernetes.io/version: "2.1.3" @@ -19953,24 +19796,21 @@ spec: revisionHistoryLimit: 10 selector: matchLabels: - opentelemetry.io/name: valkey-cart template: metadata: labels: - opentelemetry.io/name: valkey-cart - + app.kubernetes.io/component: valkey-cart app.kubernetes.io/name: valkey-cart spec: serviceAccountName: opentelemetry-demo containers: - name: valkey-cart - image: 'valkey/valkey:8.1.3-alpine' + image: "valkey/valkey:8.1.3-alpine" imagePullPolicy: IfNotPresent ports: - - containerPort: 6379 name: valkey-cart env: @@ -20035,112 +19875,111 @@ spec: affinity: podAntiAffinity: preferredDuringSchedulingIgnoredDuringExecution: - - weight: 1 - podAffinityTerm: - topologyKey: kubernetes.io/hostname - labelSelector: - matchExpressions: - - key: app.kubernetes.io/instance - operator: In - values: - - opentelemetry-demo - - key: app.kubernetes.io/name - operator: In - values: - - opensearch + - weight: 1 + podAffinityTerm: + topologyKey: kubernetes.io/hostname + labelSelector: + matchExpressions: + - key: app.kubernetes.io/instance + operator: In + values: + - opentelemetry-demo + - key: app.kubernetes.io/name + operator: In + values: + - opensearch terminationGracePeriodSeconds: 120 volumes: - - name: config - configMap: - name: opensearch-config - - emptyDir: {} - name: config-emptydir + - name: config + configMap: + name: opensearch-config + - emptyDir: {} + name: config-emptydir enableServiceLinks: true initContainers: - - name: configfile - image: "opensearchproject/opensearch:3.2.0" - imagePullPolicy: "IfNotPresent" - command: - - sh - - -c - - | - #!/usr/bin/env bash - cp -r /tmp/configfolder/* /tmp/config/ - securityContext: - capabilities: - drop: - - ALL - runAsNonRoot: true - runAsUser: 1000 - resources: - {} - volumeMounts: - - mountPath: /tmp/config/ - name: config-emptydir - - name: config - mountPath: /tmp/configfolder/opensearch.yml - subPath: opensearch.yml + - name: configfile + image: "opensearchproject/opensearch:3.2.0" + imagePullPolicy: "IfNotPresent" + command: + - sh + - -c + - | + #!/usr/bin/env bash + cp -r /tmp/configfolder/* /tmp/config/ + securityContext: + capabilities: + drop: + - ALL + runAsNonRoot: true + runAsUser: 1000 + resources: {} + volumeMounts: + - mountPath: /tmp/config/ + name: config-emptydir + - name: config + mountPath: /tmp/configfolder/opensearch.yml + subPath: opensearch.yml containers: - - name: "opensearch" - securityContext: - capabilities: - drop: - - ALL - runAsNonRoot: true - runAsUser: 1000 + - name: "opensearch" + securityContext: + capabilities: + drop: + - ALL + runAsNonRoot: true + runAsUser: 1000 - image: "opensearchproject/opensearch:3.2.0" - imagePullPolicy: "IfNotPresent" - readinessProbe: - failureThreshold: 3 - periodSeconds: 5 - tcpSocket: - port: 9200 - timeoutSeconds: 3 - startupProbe: - failureThreshold: 30 - initialDelaySeconds: 5 - periodSeconds: 10 - tcpSocket: - port: 9200 - timeoutSeconds: 3 - ports: - - name: http - containerPort: 9200 - - name: transport - containerPort: 9300 - - name: metrics - containerPort: 9600 - resources: - limits: - memory: 1100Mi - requests: - cpu: 1000m - memory: 100Mi - env: - - name: node.name - valueFrom: - fieldRef: - fieldPath: metadata.name - - name: discovery.seed_hosts - value: "opensearch-cluster-master-headless" - - name: cluster.name - value: "demo-cluster" - - name: network.host - value: "0.0.0.0" - - name: OPENSEARCH_JAVA_OPTS - value: "-Xms400m -Xmx400m" - - name: node.roles - value: "master,ingest,data,remote_cluster_client," - - name: discovery.type - value: "single-node" - - name: bootstrap.memory_lock - value: "true" - - name: DISABLE_INSTALL_DEMO_CONFIG - value: "true" - - name: DISABLE_SECURITY_PLUGIN - value: "true" - volumeMounts: - - name: config-emptydir - mountPath: /usr/share/opensearch/config/opensearch.yml - subPath: opensearch.yml + image: "opensearchproject/opensearch:3.2.0" + imagePullPolicy: "IfNotPresent" + readinessProbe: + failureThreshold: 3 + periodSeconds: 5 + tcpSocket: + port: 9200 + timeoutSeconds: 3 + startupProbe: + failureThreshold: 30 + initialDelaySeconds: 5 + periodSeconds: 10 + tcpSocket: + port: 9200 + timeoutSeconds: 3 + ports: + - name: http + containerPort: 9200 + - name: transport + containerPort: 9300 + - name: metrics + containerPort: 9600 + resources: + limits: + memory: 1100Mi + requests: + cpu: 1000m + memory: 100Mi + env: + - name: node.name + valueFrom: + fieldRef: + fieldPath: metadata.name + - name: discovery.seed_hosts + value: "opensearch-cluster-master-headless" + - name: cluster.name + value: "demo-cluster" + - name: network.host + value: "0.0.0.0" + - name: OPENSEARCH_JAVA_OPTS + value: "-Xms400m -Xmx400m" + - name: node.roles + value: "master,ingest,data,remote_cluster_client," + - name: discovery.type + value: "single-node" + - name: bootstrap.memory_lock + value: "true" + - name: DISABLE_INSTALL_DEMO_CONFIG + value: "true" + - name: DISABLE_SECURITY_PLUGIN + value: "true" + volumeMounts: + - name: config-emptydir + mountPath: /usr/share/opensearch/config/opensearch.yml + subPath: opensearch.yml diff --git a/src/grafana/provisioning/alerting/cart-service-alerting.yml b/src/grafana/provisioning/alerting/cart-service-alerting.yml index d811ecac22..7bf7991f53 100644 --- a/src/grafana/provisioning/alerting/cart-service-alerting.yml +++ b/src/grafana/provisioning/alerting/cart-service-alerting.yml @@ -23,14 +23,14 @@ groups: expr: |- histogram_quantile( 0.95, - sum by (deployment_environment_name, service_namespace, service_name, service_instance_id, http_route, http_request_method, le) ( + sum by (deployment_environment_name, "service.namespace", "service.name", "service.instance.id", "http.route", "http.request.method", le) ( rate( - http_server_request_duration_seconds_bucket{ + {"http.server.request.duration_bucket", deployment_environment_name="", - service_namespace="opentelemetry-demo", - service_name="cart", - http_request_method="POST", - http_route="/oteldemo.CartService/AddItem" + "service.namespace"="opentelemetry-demo", + "service.name"="cart", + "http.request.method"="POST", + "http.route"="/oteldemo.CartService/AddItem" }[5m] ) ) @@ -75,17 +75,17 @@ groups: keepFiringFor: 2m annotations: description: |- - The 95th percentile response time for operation {{ $labels.service_namespace - }}/{{ $labels.service_name }} "{{ $labels.http_request_method }} {{ - $labels.http_route }}" has been - above xxx seconds for 2 minutes on {{ $labels.service_instance_id}}. Current + The 95th percentile response time for operation {{ index $labels "service.namespace" + }}/{{ index $labels "service.name" }} "{{ index $labels "http.request.method" }} {{ + index $labels "http.route" }}" has been + above 0.0001 seconds for 2 minutes on {{ index $labels "service.instance.id"}}. Current value: {{ .Value | humanizeDuration }}. summary: |- - High P95 for {{ $labels.service_namespace }}/{{ $labels.service_name }} "{{ - $labels.http_request_method }} {{ $labels.http_route }}" + High P95 for {{ index $labels "service.namespace" }}/{{ index $labels "service.name" }} "{{ + index $labels "http.request.method" }} {{ index $labels "http.route" }}" labels: - service_name: cart - service_namespace: opentelemetry-demo + "service.name": cart + "service.namespace": opentelemetry-demo severity: warning team_name: webstore isPaused: false diff --git a/src/grafana/provisioning/dashboards/demo/NGINX-metrics.json b/src/grafana/provisioning/dashboards/demo/NGINX-metrics.json index 8badf72acf..12b3c06735 100644 --- a/src/grafana/provisioning/dashboards/demo/NGINX-metrics.json +++ b/src/grafana/provisioning/dashboards/demo/NGINX-metrics.json @@ -81,7 +81,7 @@ }, "disableTextWrap": false, "editorMode": "builder", - "expr": "nginx_connections_accepted_total", + "expr": "{\"nginx.connections_accepted\"}", "fullMetaSearch": false, "includeNullMetadata": true, "legendFormat": "__auto", @@ -149,7 +149,7 @@ { "disableTextWrap": false, "editorMode": "builder", - "expr": "nginx_connections_handled_total", + "expr": "{\"nginx.connections_handled\"}", "fullMetaSearch": false, "includeNullMetadata": true, "legendFormat": "{{__name__}}", @@ -213,7 +213,7 @@ { "disableTextWrap": false, "editorMode": "builder", - "expr": "nginx_requests_total", + "expr": "{\"nginx.requests\"}", "fullMetaSearch": false, "includeNullMetadata": true, "legendFormat": "{{__name__}}", @@ -310,7 +310,7 @@ { "disableTextWrap": false, "editorMode": "builder", - "expr": "nginx_connections_current", + "expr": "{\"nginx.connections_current\"}", "fullMetaSearch": false, "includeNullMetadata": true, "legendFormat": "{{state}}", @@ -338,4 +338,4 @@ "title": "[Image-Provider] NGINX Metrics", "uid": "6fb665e0-cb81-40a5-bd21-a9485c5477b4", "version": 1 -} +} \ No newline at end of file diff --git a/src/grafana/provisioning/dashboards/demo/apm-dashboard.json b/src/grafana/provisioning/dashboards/demo/apm-dashboard.json index 825738cdba..85aff30b80 100644 --- a/src/grafana/provisioning/dashboards/demo/apm-dashboard.json +++ b/src/grafana/provisioning/dashboards/demo/apm-dashboard.json @@ -116,7 +116,7 @@ "uid": "webstore-metrics" }, "editorMode": "code", - "expr": "timestamp(sum by (deployment_environment_name, service_namespace, service_name) (target_info{deployment_environment_name=~\"$deployment_environment_name\", service_namespace=~\"$service_namespace\", service_name=\"$service_name\"}) or absent{})\n", + "expr": "timestamp(sum by (deployment_environment_name, \"service.namespace\", \"service.name\") (target_info{deployment_environment_name=~\"$deployment_environment_name\", \"service.namespace\"=~\"$service_namespace\", \"service.name\"=\"$service_name\"}) or absent{})\n", "interval": "60s", "legendFormat": "__auto", "range": true, @@ -235,7 +235,7 @@ }, "disableTextWrap": false, "editorMode": "code", - "expr": "histogram_quantile(\n 0.95,\n sum by (le, deployment_environment_name, service_namespace, service_name) (\n rate(\n http_server_request_duration_seconds_bucket{\n deployment_environment_name=~\"$deployment_environment_name\",\n service_namespace=~\"$service_namespace\",\n service_name=\"$service_name\"\n }[$__rate_interval]\n )\n )\n)", + "expr": "histogram_quantile(\n 0.95,\n sum by (le, deployment_environment_name, \"service.namespace\", \"service.name\") (\n rate(\n {\"http.server.request.duration_bucket\", \n deployment_environment_name=~\"$deployment_environment_name\",\n \"service.namespace\"=~\"$service_namespace\",\n \"service.name\"=\"$service_name\"\n }[$__rate_interval]\n )\n )\n)", "fullMetaSearch": false, "includeNullMetadata": true, "interval": "60s", @@ -251,7 +251,7 @@ }, "disableTextWrap": false, "editorMode": "code", - "expr": "avg by (deployment_environment_name, service_namespace, service_name) (\n rate(\n http_server_request_duration_seconds_sum{\n deployment_environment_name=~\"$deployment_environment_name\",\n service_namespace=~\"$service_namespace\",\n service_name=\"$service_name\"\n }[$__rate_interval]\n )\n)\n/\navg by (deployment_environment_name, service_namespace, service_name) (\n rate(\n http_server_request_duration_seconds_count{\n deployment_environment_name=~\"$deployment_environment_name\",\n service_namespace=~\"$service_namespace\",\n service_name=\"$service_name\"\n }[$__rate_interval]\n )\n)", + "expr": "avg by (deployment_environment_name, \"service.namespace\", \"service.name\") (\n rate(\n {\"http.server.request.duration.sum\",\n deployment_environment_name=~\"$deployment_environment_name\",\n \"service.namespace\"=~\"$service_namespace\",\n \"service.name\"=\"$service_name\"\n }[$__rate_interval]\n )\n)\n/\navg by (deployment_environment_name, \"service.namespace\", \"service.name\") (\n rate(\n {\"http.server.request.duration_count\",\n deployment_environment_name=~\"$deployment_environment_name\",\n \"service.namespace\"=~\"$service_namespace\",\n \"service.name\"=\"$service_name\"\n }[$__rate_interval]\n )\n)", "fullMetaSearch": false, "hide": false, "includeNullMetadata": true, @@ -267,7 +267,7 @@ "uid": "${prometheus_datasource}" }, "editorMode": "code", - "expr": "histogram_quantile(\n 0.95,\n sum by (le, deployment_environment_name, service_namespace, service_name) (\n rate(\n rpc_server_duration_milliseconds_bucket{\n deployment_environment_name=~\"$deployment_environment_name\",\n service_namespace=~\"$service_namespace\",\n service_name=\"$service_name\"\n }[$__rate_interval]\n ) / 1000\n )\n)", + "expr": "histogram_quantile(\n 0.95,\n sum by (le, deployment_environment_name, \"service.namespace\", \"service.name\") (\n rate(\n {\"rpc.server.duration_bucket\",\n deployment_environment_name=~\"$deployment_environment_name\",\n \"service.namespace\"=~\"$service_namespace\",\n \"service.name\"=\"$service_name\"\n }[$__rate_interval]\n ) / 1000\n )\n)", "hide": false, "instant": false, "interval": "60", @@ -281,7 +281,7 @@ "uid": "${prometheus_datasource}" }, "editorMode": "code", - "expr": "avg by (deployment_environment_name, service_namespace, service_name) (\n rate(\n rpc_server_duration_milliseconds_sum{\n deployment_environment_name=~\"$deployment_environment_name\",\n service_namespace=~\"$service_namespace\",\n service_name=\"$service_name\"\n }[$__rate_interval]\n ) / 1000\n)\n/\navg by (deployment_environment_name, service_namespace, service_name) (\n rate(\n rpc_server_duration_milliseconds_count{\n deployment_environment_name=~\"$deployment_environment_name\",\n service_namespace=~\"$service_namespace\",\n service_name=\"$service_name\"\n }[$__rate_interval]\n )\n)", + "expr": "avg by (deployment_environment_name, \"service.namespace\", \"service.name\") (\n rate(\n {\"rpc.server.duration.sum\",\n deployment_environment_name=~\"$deployment_environment_name\",\n \"service.namespace\"=~\"$service_namespace\",\n \"service.name\"=\"$service_name\"\n }[$__rate_interval]\n ) / 1000\n)\n/\navg by (deployment_environment_name, \"service.namespace\", \"service.name\") (\n rate(\n {\"rpc.server.duration_count\",\n deployment_environment_name=~\"$deployment_environment_name\",\n \"service.namespace\"=~\"$service_namespace\",\n \"service.name\"=\"$service_name\"\n }[$__rate_interval]\n )\n)", "hide": false, "instant": false, "interval": "60", @@ -387,7 +387,7 @@ }, "disableTextWrap": false, "editorMode": "code", - "expr": "(\n (sum by(deployment_environment_name, service_namespace, service_name) (rate(http_server_request_duration_seconds_count{deployment_environment_name=~\"$deployment_environment_name\", service_namespace=~\"$service_namespace\", service_name=\"$service_name\", http_response_status_code=~\"5..\"}[$__rate_interval])) * 100) \n / \n sum by(deployment_environment_name, service_namespace, service_name) (rate(http_server_request_duration_seconds_count{deployment_environment_name=~\"$deployment_environment_name\", service_namespace=~\"$service_namespace\", service_name=\"$service_name\"}[$__rate_interval]))\n)\nor\n(\n 0\n * \n sum by(deployment_environment_name, service_namespace, service_name) (rate(http_server_request_duration_seconds_count{deployment_environment_name=~\"$deployment_environment_name\", service_namespace=~\"$service_namespace\", service_name=\"$service_name\"}[$__rate_interval]))\n)", + "expr": "(\n (sum by(deployment_environment_name, \"service.namespace\", \"service.name\") (rate({\"http.server.request.duration_count\", deployment_environment_name=~\"$deployment_environment_name\", \"service.namespace\"=~\"$service_namespace\", \"service.name\"=\"$service_name\", \"http.response.status_code\"=~\"5..\"}[$__rate_interval])) * 100) \n / \n sum by(deployment_environment_name, \"service.namespace\", \"service.name\") (rate({\"http.server.request.duration_count\", deployment_environment_name=~\"$deployment_environment_name\", \"service.namespace\"=~\"$service_namespace\", \"service.name\"=\"$service_name\"}[$__rate_interval]))\n)\nor\n(\n 0\n * \n sum by(deployment_environment_name, \"service.namespace\", \"service.name\") (rate({\"http.server.request.duration_count\", deployment_environment_name=~\"$deployment_environment_name\", \"service.namespace\"=~\"$service_namespace\", \"service.name\"=\"$service_name\"}[$__rate_interval]))\n)", "fullMetaSearch": false, "hide": false, "includeNullMetadata": true, @@ -404,7 +404,7 @@ "uid": "${prometheus_datasource}" }, "editorMode": "code", - "expr": "((sum without (rpc_grpc_status_code, instance) (rate(rpc_server_duration_milliseconds_count{deployment_environment_name=~\"$deployment_environment_name\", service_namespace=~\"$service_namespace\", service_name=\"$service_name\", rpc_grpc_status_code!=\"0\"}[$__rate_interval])) * 100) / sum without (rpc_grpc_status_code, instance) (rate(rpc_server_duration_milliseconds_count{deployment_environment_name=~\"$deployment_environment_name\", service_namespace=~\"$service_namespace\", service_name=\"$service_name\"}[$__rate_interval])))\nor\n(0 * sum without (rpc_grpc_status_code, instance) (rate(rpc_server_duration_milliseconds_count{deployment_environment_name=~\"$deployment_environment_name\", service_namespace=~\"$service_namespace\", service_name=\"$service_name\"}[$__rate_interval])))", + "expr": "((sum without (\"rpc.grpc.status_code\", instance) (rate({\"rpc.server.duration_count\", deployment_environment_name=~\"$deployment_environment_name\", \"service.namespace\"=~\"$service_namespace\", \"service.name\"=\"$service_name\", \"rpc.grpc.status_code\"!=\"0\"}[$__rate_interval])) * 100) / sum without (\"rpc.grpc.status_code\", instance) (rate({\"rpc.server.duration_count\", deployment_environment_name=~\"$deployment_environment_name\", \"service.namespace\"=~\"$service_namespace\", \"service.name\"=\"$service_name\"}[$__rate_interval])))\nor\n(0 * sum without (\"rpc.grpc.status_code\", instance) (rate({\"rpc.server.duration_count\", deployment_environment_name=~\"$deployment_environment_name\", \"service.namespace\"=~\"$service_namespace\", \"service.name\"=\"$service_name\"}[$__rate_interval])))", "hide": false, "instant": false, "interval": "60", @@ -511,7 +511,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "(sum(rate(http_server_request_duration_seconds_count{deployment_environment_name=~\"$deployment_environment_name\", service_namespace=~\"$service_namespace\", service_name=\"$service_name\"}[$__rate_interval])) by (deployment_environment_name, service_namespace, service_name)) ", + "expr": "(sum(rate({\"http.server.request.duration_count\", deployment_environment_name=~\"$deployment_environment_name\", \"service.namespace\"=~\"$service_namespace\", \"service.name\"=\"$service_name\"}[$__rate_interval])) by (deployment_environment_name, \"service.namespace\", \"service.name\")) ", "hide": false, "instant": false, "interval": "60s", @@ -525,7 +525,7 @@ "uid": "${prometheus_datasource}" }, "editorMode": "code", - "expr": "(sum(rate(rpc_server_duration_milliseconds_count{deployment_environment_name=~\"$deployment_environment_name\", service_namespace=~\"$service_namespace\", service_name=\"$service_name\"}[$__rate_interval])) by (deployment_environment_name, service_namespace, service_name)) * $__interval_ms / 1000", + "expr": "(sum(rate({\"rpc.server.duration_count\", deployment_environment_name=~\"$deployment_environment_name\", \"service.namespace\"=~\"$service_namespace\", \"service.name\"=\"$service_name\"}[$__rate_interval])) by (deployment_environment_name, \"service.namespace\", \"service.name\")) * $__interval_ms / 1000", "hide": false, "instant": false, "interval": "60", @@ -550,7 +550,7 @@ }, "id": 40, "options": { - "alertInstanceLabelFilter": "{service_name=\"$service_name\", service_namespace=\"$service_namespace\"}", + "alertInstanceLabelFilter": "{\"service.name\"=\"$service_name\", \"service.namespace\"=\"$service_namespace\"}", "alertName": "", "dashboardAlerts": false, "groupBy": [], @@ -683,7 +683,7 @@ }, "disableTextWrap": false, "editorMode": "code", - "expr": "\n sum by (operation) (\n label_join(\n rate(http_server_request_duration_seconds_count{deployment_environment_name=~\"$deployment_environment_name\", service_namespace=~\"$service_namespace\", service_name=\"$service_name\"}[$__rate_interval]),\n \"operation\",\n \" \",\n \"http_request_method\",\n \"http_route\"\n )\n )\n ", + "expr": "\n sum by (operation) (\n label_join(\n rate({\"http.server.request.duration_count\", deployment_environment_name=~\"$deployment_environment_name\", \"service.namespace\"=~\"$service_namespace\", \"service.name\"=\"$service_name\"}[$__rate_interval]),\n \"operation\",\n \" \",\n \"http_request_method\",\n \"http_route\"\n )\n )\n ", "fullMetaSearch": false, "includeNullMetadata": true, "interval": "60s", @@ -698,7 +698,7 @@ "uid": "${prometheus_datasource}" }, "editorMode": "code", - "expr": "(\n sum by (operation) (\n label_join(\n rate(http_server_request_duration_seconds_count{deployment_environment_name=~\"$deployment_environment_name\", service_namespace=~\"$service_namespace\", service_name=\"$service_name\", http_response_status_code=~\"5..\"}[$__rate_interval]),\n \"operation\",\n \" \",\n \"http_request_method\",\n \"http_route\"\n )\n )\n / \n sum by (operation) (\n label_join(\n rate(http_server_request_duration_seconds_count{deployment_environment_name=~\"$deployment_environment_name\", service_namespace=~\"$service_namespace\", service_name=\"$service_name\"}[$__rate_interval]),\n \"operation\",\n \" \",\n \"http_request_method\",\n \"http_route\"\n )\n )\n ) or (0 * \n sum by (operation) (\n label_join(\n rate(http_server_request_duration_seconds_count{deployment_environment_name=~\"$deployment_environment_name\", service_namespace=~\"$service_namespace\", service_name=\"$service_name\"}[$__rate_interval]),\n \"operation\",\n \" \",\n \"http_request_method\",\n \"http_route\"\n )\n )\n )", + "expr": "(\n sum by (operation) (\n label_join(\n rate({\"http.server.request.duration_count\", deployment_environment_name=~\"$deployment_environment_name\", \"service.namespace\"=~\"$service_namespace\", \"service.name\"=\"$service_name\", \"http.response.status_code\"=~\"5..\"}[$__rate_interval]),\n \"operation\",\n \" \",\n \"http_request_method\",\n \"http_route\"\n )\n )\n / \n sum by (operation) (\n label_join(\n rate({\"http.server.request.duration_count\", deployment_environment_name=~\"$deployment_environment_name\", \"service.namespace\"=~\"$service_namespace\", \"service.name\"=\"$service_name\"}[$__rate_interval]),\n \"operation\",\n \" \",\n \"http_request_method\",\n \"http_route\"\n )\n )\n ) or (0 * \n sum by (operation) (\n label_join(\n rate({\"http.server.request.duration_count\", deployment_environment_name=~\"$deployment_environment_name\", \"service.namespace\"=~\"$service_namespace\", \"service.name\"=\"$service_name\"}[$__rate_interval]),\n \"operation\",\n \" \",\n \"http_request_method\",\n \"http_route\"\n )\n )\n )", "hide": false, "instant": false, "interval": "60s", @@ -712,7 +712,7 @@ "uid": "webstore-metrics" }, "editorMode": "code", - "expr": "\n histogram_quantile(\n 0.99,\n sum by (le, operation) (\n label_join(\n rate(http_server_request_duration_seconds_bucket{deployment_environment_name=~\"$deployment_environment_name\", service_namespace=~\"$service_namespace\", service_name=\"$service_name\"}[5m]),\n \"operation\",\n \" \",\n \"http_request_method\",\n \"http_route\"\n )\n )\n )\n ", + "expr": "\n histogram_quantile(\n 0.99,\n sum by (le, operation) (\n label_join(\n rate({\"http.server.request.duration_bucket\", deployment_environment_name=~\"$deployment_environment_name\", \"service.namespace\"=~\"$service_namespace\", \"service.name\"=\"$service_name\"}[5m]),\n \"operation\",\n \" \",\n \"http_request_method\",\n \"http_route\"\n )\n )\n )\n ", "hide": false, "instant": false, "interval": "60s", @@ -873,7 +873,7 @@ }, "disableTextWrap": false, "editorMode": "code", - "expr": "\nsum by (operation) (\n label_join(\n rate(rpc_server_duration_milliseconds_count{deployment_environment_name=~\"$deployment_environment_name\", service_namespace=~\"$service_namespace\", service_name=\"$service_name\"}[$__rate_interval]),\n \"operation\",\n \"/\",\n \"rpc_service\",\n \"rpc_method\"\n )\n)\n ", + "expr": "\nsum by (operation) (\n label_join(\n rate({\"rpc.server.duration_count\", deployment_environment_name=~\"$deployment_environment_name\", \"service.namespace\"=~\"$service_namespace\", \"service.name\"=\"$service_name\"}[$__rate_interval]),\n \"operation\",\n \"/\",\n \"rpc_service\",\n \"rpc_method\"\n )\n)\n ", "fullMetaSearch": false, "hide": false, "includeNullMetadata": true, @@ -889,7 +889,7 @@ "uid": "${prometheus_datasource}" }, "editorMode": "code", - "expr": "(\n sum by (operation) (\n label_join(\n rate(rpc_server_duration_milliseconds_count{deployment_environment_name=~\"$deployment_environment_name\", service_namespace=~\"$service_namespace\", service_name=\"$service_name\", rpc_grpc_status_code!=\"0\"}[$__rate_interval]),\n \"operation\",\n \"/\",\n \"rpc_service\",\n \"rpc_method\"\n )\n )\n / \n sum by (operation) (\n label_join(\n rate(rpc_server_duration_milliseconds_count{deployment_environment_name=~\"$deployment_environment_name\", service_namespace=~\"$service_namespace\", service_name=\"$service_name\"}[$__rate_interval]),\n \"operation\",\n \"/\",\n \"rpc_service\",\n \"rpc_method\"\n )\n )\n ) or (0 * \n sum by (operation) (\n label_join(\n rate(rpc_server_duration_milliseconds_count{deployment_environment_name=~\"$deployment_environment_name\", service_namespace=~\"$service_namespace\", service_name=\"$service_name\"}[$__rate_interval]),\n \"operation\",\n \"/\",\n \"rpc_service\",\n \"rpc_method\"\n )\n )\n )\n ", + "expr": "(\n sum by (operation) (\n label_join(\n rate({\"rpc.server.duration_count\", deployment_environment_name=~\"$deployment_environment_name\", \"service.namespace\"=~\"$service_namespace\", \"service.name\"=\"$service_name\", \"rpc.grpc.status_code\"!=\"0\"}[$__rate_interval]),\n \"operation\",\n \"/\",\n \"rpc_service\",\n \"rpc_method\"\n )\n )\n / \n sum by (operation) (\n label_join(\n rate({\"rpc.server.duration_count\", deployment_environment_name=~\"$deployment_environment_name\", \"service.namespace\"=~\"$service_namespace\", \"service.name\"=\"$service_name\"}[$__rate_interval]),\n \"operation\",\n \"/\",\n \"rpc_service\",\n \"rpc_method\"\n )\n )\n ) or (0 * \n sum by (operation) (\n label_join(\n rate({\"rpc.server.duration_count\", deployment_environment_name=~\"$deployment_environment_name\", \"service.namespace\"=~\"$service_namespace\", \"service.name\"=\"$service_name\"}[$__rate_interval]),\n \"operation\",\n \"/\",\n \"rpc_service\",\n \"rpc_method\"\n )\n )\n )\n ", "hide": false, "instant": false, "interval": "60s", @@ -903,7 +903,7 @@ "uid": "webstore-metrics" }, "editorMode": "code", - "expr": "\n histogram_quantile(\n 0.99,\n sum by (le, operation) (\n label_join(\n rate(rpc_server_duration_milliseconds_bucket{deployment_environment_name=~\"$deployment_environment_name\", service_namespace=~\"$service_namespace\", service_name=\"$service_name\"}[5m]),\n \"operation\",\n \"/\",\n \"rpc_service\",\n \"rpc_method\"\n )\n )\n )\n ", + "expr": "\n histogram_quantile(\n 0.99,\n sum by (le, operation) (\n label_join(\n rate({\"rpc.server.duration_bucket\", deployment_environment_name=~\"$deployment_environment_name\", \"service.namespace\"=~\"$service_namespace\", \"service.name\"=\"$service_name\"}[5m]),\n \"operation\",\n \"/\",\n \"rpc_service\",\n \"rpc_method\"\n )\n )\n )\n ", "hide": false, "instant": false, "interval": "60s", @@ -1071,7 +1071,7 @@ }, "disableTextWrap": false, "editorMode": "code", - "expr": "\n sum by (outbound_service) (\n label_join(\n rate(http_client_request_duration_seconds_count{deployment_environment_name=~\"$deployment_environment_name\", service_namespace=~\"$service_namespace\", service_name=\"$service_name\"}[$__rate_interval]),\n \"outbound_service\",\n \" \",\n \"server_address\",\n \"http_request_method\",\n \"url_template\"\n )\n )\n ", + "expr": "\n sum by (outbound_service) (\n label_join(\n rate({\"http.client.request.duration_count\", deployment_environment_name=~\"$deployment_environment_name\", \"service.namespace\"=~\"$service_namespace\", \"service.name\"=\"$service_name\"}[$__rate_interval]),\n \"outbound_service\",\n \" \",\n \"server_address\",\n \"http_request_method\",\n \"url_template\"\n )\n )\n ", "fullMetaSearch": false, "includeNullMetadata": true, "interval": "60s", @@ -1086,7 +1086,7 @@ "uid": "${prometheus_datasource}" }, "editorMode": "code", - "expr": "(\n sum by (outbound_service) (\n label_join(\n rate(http_client_request_duration_seconds_count{deployment_environment_name=~\"$deployment_environment_name\", service_namespace=~\"$service_namespace\", service_name=\"$service_name\", http_response_status_code=~\"5..\"}[$__rate_interval]),\n \"outbound_service\",\n \" \",\n \"server_address\",\n \"http_request_method\",\n \"url_template\"\n )\n )\n / \n sum by (outbound_service) (\n label_join(\n rate(http_client_request_duration_seconds_count{deployment_environment_name=~\"$deployment_environment_name\", service_namespace=~\"$service_namespace\", service_name=\"$service_name\"}[$__rate_interval]),\n \"outbound_service\",\n \" \",\n \"server_address\",\n \"http_request_method\",\n \"url_template\"\n )\n )\n ) or (0 * \n sum by (outbound_service) (\n label_join(\n rate(http_client_request_duration_seconds_count{deployment_environment_name=~\"$deployment_environment_name\", service_namespace=~\"$service_namespace\", service_name=\"$service_name\"}[$__rate_interval]),\n \"outbound_service\",\n \" \",\n \"server_address\",\n \"http_request_method\",\n \"url_template\"\n )\n )\n )", + "expr": "(\n sum by (outbound_service) (\n label_join(\n rate({\"http.client.request.duration_count\", deployment_environment_name=~\"$deployment_environment_name\", \"service.namespace\"=~\"$service_namespace\", \"service.name\"=\"$service_name\", \"http.response.status_code\"=~\"5..\"}[$__rate_interval]),\n \"outbound_service\",\n \" \",\n \"server_address\",\n \"http_request_method\",\n \"url_template\"\n )\n )\n / \n sum by (outbound_service) (\n label_join(\n rate({\"http.client.request.duration_count\", deployment_environment_name=~\"$deployment_environment_name\", \"service.namespace\"=~\"$service_namespace\", \"service.name\"=\"$service_name\"}[$__rate_interval]),\n \"outbound_service\",\n \" \",\n \"server_address\",\n \"http_request_method\",\n \"url_template\"\n )\n )\n ) or (0 * \n sum by (outbound_service) (\n label_join(\n rate({\"http.client.request.duration_count\", deployment_environment_name=~\"$deployment_environment_name\", \"service.namespace\"=~\"$service_namespace\", \"service.name\"=\"$service_name\"}[$__rate_interval]),\n \"outbound_service\",\n \" \",\n \"server_address\",\n \"http_request_method\",\n \"url_template\"\n )\n )\n )", "hide": false, "instant": false, "interval": "60s", @@ -1100,7 +1100,7 @@ "uid": "webstore-metrics" }, "editorMode": "code", - "expr": "\nhistogram_quantile(\n 0.99,\n sum by (le, outbound_service) (\n label_join(\n rate(http_client_request_duration_seconds_bucket{deployment_environment_name=~\"$deployment_environment_name\", service_namespace=~\"$service_namespace\", service_name=\"$service_name\"}[5m]),\n \"outbound_service\",\n \" \",\n \"server_address\",\n \"http_request_method\",\n \"url_template\"\n )\n )\n)", + "expr": "\nhistogram_quantile(\n 0.99,\n sum by (le, outbound_service) (\n label_join(\n rate({\"http.client.request.duration_bucket\", deployment_environment_name=~\"$deployment_environment_name\", \"service.namespace\"=~\"$service_namespace\", \"service.name\"=\"$service_name\"}[5m]),\n \"outbound_service\",\n \" \",\n \"server_address\",\n \"http_request_method\",\n \"url_template\"\n )\n )\n)", "hide": false, "instant": false, "interval": "60s", @@ -1258,7 +1258,7 @@ }, "disableTextWrap": false, "editorMode": "code", - "expr": "sum by (database) (\n label_join(\n rate(db_client_operation_duration_seconds_count{deployment_environment_name=~\"$deployment_environment_name\", service_namespace=~\"$service_namespace\", service_name=\"$service_name\"}[$__rate_interval]),\n \"database\",\n \"/\",\n \"server_address\",\n \"db_namespace\"\n )\n)\n ", + "expr": "sum by (database) (\n label_join(\n rate({\"db_client_operation_duration_seconds_count\",deployment_environment_name=~\"$deployment_environment_name\", \"service.namespace\"=~\"$service_namespace\", \"service.name\"=\"$service_name\"}[$__rate_interval]),\n \"database\",\n \"/\",\n \"server_address\",\n \"db_namespace\"\n )\n)\n ", "fullMetaSearch": false, "hide": false, "includeNullMetadata": true, @@ -1274,7 +1274,7 @@ "uid": "${prometheus_datasource}" }, "editorMode": "code", - "expr": "(\n sum by (database) (\n label_join(\n rate(db_client_operation_duration_seconds_count{deployment_environment_name=~\"$deployment_environment_name\", service_namespace=~\"$service_namespace\", service_name=\"$service_name\", http_response_status_code=~\"5..\"}[$__rate_interval]),\n \"database\",\n \"/\",\n \"server_address\",\n \"db_namespace\"\n )\n )\n / \n sum by (database) (\n label_join(\n rate(db_client_operation_duration_seconds_count{deployment_environment_name=~\"$deployment_environment_name\", service_namespace=~\"$service_namespace\", service_name=\"$service_name\"}[$__rate_interval]),\n \"database\",\n \"/\",\n \"server_address\",\n \"db_namespace\"\n )\n )\n ) or (0 * \n sum by (database) (\n label_join(\n rate(db_client_operation_duration_seconds_count{deployment_environment_name=~\"$deployment_environment_name\", service_namespace=~\"$service_namespace\", service_name=\"$service_name\"}[$__rate_interval]),\n \"database\",\n \"/\",\n \"server_address\",\n \"db_namespace\"\n )\n )\n )", + "expr": "(\n sum by (database) (\n label_join(\n rate({\"db_client_operation_duration_seconds_count\",deployment_environment_name=~\"$deployment_environment_name\", \"service.namespace\"=~\"$service_namespace\", \"service.name\"=\"$service_name\", \"http.response.status_code\"=~\"5..\"}[$__rate_interval]),\n \"database\",\n \"/\",\n \"server_address\",\n \"db_namespace\"\n )\n )\n / \n sum by (database) (\n label_join(\n rate({\"db_client_operation_duration_seconds_count\",deployment_environment_name=~\"$deployment_environment_name\", \"service.namespace\"=~\"$service_namespace\", \"service.name\"=\"$service_name\"}[$__rate_interval]),\n \"database\",\n \"/\",\n \"server_address\",\n \"db_namespace\"\n )\n )\n ) or (0 * \n sum by (database) (\n label_join(\n rate({\"db_client_operation_duration_seconds_count\",deployment_environment_name=~\"$deployment_environment_name\", \"service.namespace\"=~\"$service_namespace\", \"service.name\"=\"$service_name\"}[$__rate_interval]),\n \"database\",\n \"/\",\n \"server_address\",\n \"db_namespace\"\n )\n )\n )", "hide": false, "instant": false, "interval": "60s", @@ -1288,7 +1288,7 @@ "uid": "webstore-metrics" }, "editorMode": "code", - "expr": "\nhistogram_quantile(\n 0.99,\n sum by (le, database) (\n label_join(\n rate(db_client_operation_duration_seconds_bucket{deployment_environment_name=~\"$deployment_environment_name\", service_namespace=~\"$service_namespace\", service_name=\"$service_name\"}[5m]),\n \"database\",\n \"/\",\n \"server_address\",\n \"db_namespace\"\n )\n )\n)", + "expr": "\nhistogram_quantile(\n 0.99,\n sum by (le, database) (\n label_join(\n rate({\"db.client.operation.duration_bucket\", deployment_environment_name=~\"$deployment_environment_name\", \"service.namespace\"=~\"$service_namespace\", \"service.name\"=\"$service_name\"}[5m]),\n \"database\",\n \"/\",\n \"server_address\",\n \"db_namespace\"\n )\n )\n)", "hide": false, "instant": false, "interval": "60s", @@ -1450,7 +1450,7 @@ }, "disableTextWrap": false, "editorMode": "code", - "expr": "\n sum by (outbound_service) (\n label_join(\n rate(rpc_client_duration_milliseconds_count{deployment_environment_name=~\"$deployment_environment_name\", service_namespace=~\"$service_namespace\", service_name=\"$service_name\"}[$__rate_interval]),\n \"outbound_service\",\n \"/\",\n \"server_address\",\n \"rpc_service\",\n \"rpc_method\"\n )\n )\n ", + "expr": "\n sum by (outbound_service) (\n label_join(\n rate(rpc_client_duration_count{deployment_environment_name=~\"$deployment_environment_name\", \"service.namespace\"=~\"$service_namespace\", \"service.name\"=\"$service_name\"}[$__rate_interval]),\n \"outbound_service\",\n \"/\",\n \"server_address\",\n \"rpc_service\",\n \"rpc_method\"\n )\n )\n ", "fullMetaSearch": false, "hide": false, "includeNullMetadata": true, @@ -1466,7 +1466,7 @@ "uid": "${prometheus_datasource}" }, "editorMode": "code", - "expr": "(\n sum by (outbound_service) (\n label_join(\n rate(rpc_client_duration_milliseconds_count{deployment_environment_name=~\"$deployment_environment_name\", service_namespace=~\"$service_namespace\", service_name=\"$service_name\", http_response_status_code=~\"5..\"}[$__rate_interval]),\n \"outbound_service\",\n \"/\",\n \"server_address\",\n \"rpc_service\",\n \"rpc_method\"\n )\n )\n / \n sum by (outbound_service) (\n label_join(\n rate(rpc_client_duration_milliseconds_count{deployment_environment_name=~\"$deployment_environment_name\", service_namespace=~\"$service_namespace\", service_name=\"$service_name\"}[$__rate_interval]),\n \"outbound_service\",\n \"/\",\n \"server_address\",\n \"rpc_service\",\n \"rpc_method\"\n )\n )\n ) or (0 * \n sum by (outbound_service) (\n label_join(\n rate(rpc_client_duration_milliseconds_count{deployment_environment_name=~\"$deployment_environment_name\", service_namespace=~\"$service_namespace\", service_name=\"$service_name\"}[$__rate_interval]),\n \"outbound_service\",\n \"/\",\n \"server_address\",\n \"rpc_service\",\n \"rpc_method\"\n )\n )\n )", + "expr": "(\n sum by (outbound_service) (\n label_join(\n rate(rpc_client_duration_count{deployment_environment_name=~\"$deployment_environment_name\", \"service.namespace\"=~\"$service_namespace\", \"service.name\"=\"$service_name\", \"http.response.status_code\"=~\"5..\"}[$__rate_interval]),\n \"outbound_service\",\n \"/\",\n \"server_address\",\n \"rpc_service\",\n \"rpc_method\"\n )\n )\n / \n sum by (outbound_service) (\n label_join(\n rate(rpc_client_duration_count{deployment_environment_name=~\"$deployment_environment_name\", \"service.namespace\"=~\"$service_namespace\", \"service.name\"=\"$service_name\"}[$__rate_interval]),\n \"outbound_service\",\n \"/\",\n \"server_address\",\n \"rpc_service\",\n \"rpc_method\"\n )\n )\n ) or (0 * \n sum by (outbound_service) (\n label_join(\n rate(rpc_client_duration_count{deployment_environment_name=~\"$deployment_environment_name\", \"service.namespace\"=~\"$service_namespace\", \"service.name\"=\"$service_name\"}[$__rate_interval]),\n \"outbound_service\",\n \"/\",\n \"server_address\",\n \"rpc_service\",\n \"rpc_method\"\n )\n )\n )", "hide": false, "instant": false, "interval": "60s", @@ -1480,7 +1480,7 @@ "uid": "webstore-metrics" }, "editorMode": "code", - "expr": "\nhistogram_quantile(\n 0.99,\n sum by (le, outbound_service) (\n label_join(\n rate(rpc_client_duration_milliseconds_bucket{deployment_environment_name=~\"$deployment_environment_name\", service_namespace=~\"$service_namespace\", service_name=\"$service_name\"}[5m]),\n \"outbound_service\",\n \"/\",\n \"server_address\",\n \"rpc_service\",\n \"rpc_method\"\n )\n )\n)", + "expr": "\nhistogram_quantile(\n 0.99,\n sum by (le, outbound_service) (\n label_join(\n rate({\"rpc.client.duration_bucket\", deployment_environment_name=~\"$deployment_environment_name\", \"service.namespace\"=~\"$service_namespace\", \"service.name\"=\"$service_name\"}[5m]),\n \"outbound_service\",\n \"/\",\n \"server_address\",\n \"rpc_service\",\n \"rpc_method\"\n )\n )\n)", "hide": false, "instant": false, "interval": "60s", @@ -1632,7 +1632,7 @@ "targets": [ { "editorMode": "code", - "expr": "sum by (service_instance_id_host_name) (\n label_join(\n (\n sum by (service_instance_id, host_name) (\n rate(system_cpu_time_seconds_total{job=\"\", state!=\"idle\"}[$__rate_interval])\n )\n * on(host_name) group_left(service_instance_id)\n target_info{service_name=\"${service_name}\"}\n ),\n \"service_instance_id_host_name\",\n \" / \",\n \"service_instance_id\",\n \"host_name\"\n )\n)", + "expr": "sum by (service_instance_id_host_name) (\n label_join(\n (\n sum by (service_instance_id, host_name) (\n rate({\"system.cpu.time\",job=\"\", state!=\"idle\"}[$__rate_interval])\n )\n * on(host_name) group_left(service_instance_id)\n target_info{\"service.name\"=\"${service_name}\"}\n ),\n \"service_instance_id_host_name\",\n \" / \",\n \"service_instance_id\",\n \"host_name\"\n )\n)", "hide": false, "legendFormat": "__auto", "range": true, @@ -1644,7 +1644,7 @@ "uid": "webstore-metrics" }, "editorMode": "code", - "expr": "sum by (service_instance_id_host_name) (\n label_join(\n (\n (\n sum by (service_instance_id, host_name) (\n system_memory_usage_bytes{job=\"\", state!=\"free\"}\n )\n /\n sum by (service_instance_id, host_name) (\n system_memory_usage_bytes{job=\"\"}\n )\n )\n * on(host_name) group_left(service_instance_id) (\n target_info{service_name=\"${service_name}\"}\n )\n ),\n \"service_instance_id_host_name\",\n \" / \",\n \"service_instance_id\",\n \"host_name\"\n )\n)", + "expr": "sum by (service_instance_id_host_name) (\n label_join(\n (\n (\n sum by (service_instance_id, host_name) (\n {\"system.memory.usage\", job=\"\", state!=\"free\"}\n )\n /\n sum by (service_instance_id, host_name) (\n {\"system.memory.usage\", job=\"\"}\n )\n )\n * on(host_name) group_left(service_instance_id) (\n target_info{\"service.name\"=\"${service_name}\"}\n )\n ),\n \"service_instance_id_host_name\",\n \" / \",\n \"service_instance_id\",\n \"host_name\"\n )\n)", "hide": false, "instant": false, "legendFormat": "__auto", @@ -1999,7 +1999,7 @@ }, "queryType": "search", "refId": "A", - "service": "$service_name", + "service": "$\"service.name\"", "tags": "service.namespace=\"$service_namespace\"" } ], @@ -2086,7 +2086,7 @@ "type": "prometheus", "uid": "${prometheus_datasource}" }, - "definition": "label_values(target_info{deployment_environment_name=~\"$deployment_environment_name\"},service_namespace)", + "definition": "label_values(target_info{deployment_environment_name=~\"$deployment_environment_name\"},\"service.namespace\")", "description": "Service namespace.\nResource attribute `service.namespace` via `target_info`", "includeAll": false, "label": "Namespace", @@ -2094,7 +2094,7 @@ "options": [], "query": { "qryType": 1, - "query": "label_values(target_info{deployment_environment_name=~\"$deployment_environment_name\"},service_namespace)", + "query": "label_values(target_info{deployment_environment_name=~\"$deployment_environment_name\"},service.namespace)", "refId": "PrometheusVariableQueryEditor-VariableQuery" }, "refresh": 1, @@ -2111,14 +2111,14 @@ "type": "prometheus", "uid": "webstore-metrics" }, - "definition": "label_values(target_info{service_namespace=~\"$service_namespace\", deployment_environment_name=~\"$deployment_environment_name\"},service_name)", + "definition": "label_values(target_info{\"service.namespace\"=~\"$service_namespace\", deployment_environment_name=~\"$deployment_environment_name\"},\"service.namespace\")", "description": "Service name.\nResource attribute `service.name` via `target_info`.", "label": "Name", "name": "service_name", "options": [], "query": { "qryType": 1, - "query": "label_values(target_info{service_namespace=~\"$service_namespace\", deployment_environment_name=~\"$deployment_environment_name\"},service_name)", + "query": "label_values(target_info{\"service.namespace\"=~\"$service_namespace\", deployment_environment_name=~\"$deployment_environment_name\"},service.name)", "refId": "PrometheusVariableQueryEditor-VariableQuery" }, "refresh": 2, diff --git a/src/grafana/provisioning/dashboards/demo/demo-dashboard.json b/src/grafana/provisioning/dashboards/demo/demo-dashboard.json index 6f30f33038..eea2744c2f 100644 --- a/src/grafana/provisioning/dashboards/demo/demo-dashboard.json +++ b/src/grafana/provisioning/dashboards/demo/demo-dashboard.json @@ -155,7 +155,7 @@ "uid": "webstore-metrics" }, "editorMode": "code", - "expr": "sum by (span_name) (rate(traces_span_metrics_duration_milliseconds_count{service_name=\"${service}\"}[$__rate_interval]))", + "expr": "sum by (span_name) (rate({\"traces.span.metrics.duration_count\", \"service.name\"=\"${service}\"}[$__rate_interval]))", "legendFormat": "{{ span_name }}", "range": true, "refId": "A" @@ -254,7 +254,7 @@ "uid": "webstore-metrics" }, "editorMode": "code", - "expr": "sum by (span_name) (rate(traces_span_metrics_calls_total{status_code=\"STATUS_CODE_ERROR\", service_name=\"${service}\"}[$__rate_interval]))", + "expr": "sum by (span_name) (rate({\"traces.span.metrics.calls\", status_code=\"STATUS_CODE_ERROR\", \"service.name\"=\"${service}\"}[$__rate_interval]))", "interval": "", "legendFormat": "{{ span_name }}", "range": true, @@ -356,7 +356,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "histogram_quantile(0.50, sum(rate(traces_span_metrics_duration_milliseconds_bucket{service_name=\"${service}\"}[$__rate_interval])) by (le, span_name))", + "expr": "histogram_quantile(0.50, sum(rate({\"traces.span.metrics.duration_bucket\", \"service.name\"=\"${service}\"}[$__rate_interval])) by (le, span_name))", "legendFormat": "{{span_name}}", "range": true, "refId": "A" @@ -752,7 +752,7 @@ "uid": "webstore-metrics" }, "editorMode": "code", - "expr": "rate(process_runtime_cpython_cpu_time_seconds_total{type=~\"system\"}[$__rate_interval])*100", + "expr": "rate({\"process.runtime.cpython.cpu_time\", type=~\"system\"}[$__rate_interval])*100", "hide": false, "interval": "2m", "legendFormat": "{{job}} ({{type}})", @@ -765,7 +765,7 @@ "uid": "webstore-metrics" }, "editorMode": "code", - "expr": "rate(process_runtime_cpython_cpu_time_seconds_total{type=~\"user\"}[$__rate_interval])*100", + "expr": "rate({\"process.runtime.cpython.cpu_time\", type=~\"user\"}[$__rate_interval])*100", "hide": false, "interval": "2m", "legendFormat": "{{job}} ({{type}})", @@ -874,7 +874,7 @@ "uid": "webstore-metrics" }, "editorMode": "code", - "expr": "process_runtime_cpython_memory_bytes{type=\"rss\"}", + "expr": "{\"process.runtime.cpython.memory\", type=\"rss\"}", "legendFormat": "{{job}}", "range": true, "refId": "A" @@ -980,7 +980,7 @@ "uid": "webstore-metrics" }, "editorMode": "code", - "expr": "rate(app_recommendations_counter_total{recommendation_type=\"catalog\"}[$__rate_interval])", + "expr": "rate(app_recommendations_counter{\"recommendation.type\"=\"catalog\"}[$__rate_interval])", "interval": "2m", "legendFormat": "recommendations", "range": true, @@ -1079,7 +1079,7 @@ "uid": "webstore-metrics" }, "editorMode": "code", - "expr": "rate(otel_trace_span_processor_spans{job=\"quote\"}[2m])*120", + "expr": "rate({\"otel.trace.span_processor.spans\", job=\"opentelemetry-demo/quote\"}[2m])*120", "interval": "2m", "legendFormat": "{{state}}", "range": true, @@ -1158,13 +1158,13 @@ "type": "prometheus", "uid": "webstore-metrics" }, - "definition": "traces_span_metrics_duration_milliseconds_bucket", + "definition": "{\"traces.span.metrics.duration_bucket\"}", "includeAll": false, "label": "Service", "name": "service", "options": [], "query": { - "query": "traces_span_metrics_duration_milliseconds_bucket", + "query": "{\"traces.span.metrics.duration_bucket\"}", "refId": "PrometheusVariableQueryEditor-VariableQuery" }, "refresh": 1, diff --git a/src/grafana/provisioning/dashboards/demo/exemplars-dashboard.json b/src/grafana/provisioning/dashboards/demo/exemplars-dashboard.json index b48e99e2d2..0abf877668 100644 --- a/src/grafana/provisioning/dashboards/demo/exemplars-dashboard.json +++ b/src/grafana/provisioning/dashboards/demo/exemplars-dashboard.json @@ -127,7 +127,7 @@ "disableTextWrap": false, "editorMode": "builder", "exemplar": true, - "expr": "sum by(le) (rate(app_cart_get_cart_latency_seconds_bucket[$__rate_interval]))", + "expr": "sum by(le) (rate({\"app.cart.get_cart.latency_bucket\"}[$__rate_interval]))", "format": "heatmap", "fullMetaSearch": false, "includeNullMetadata": false, @@ -231,7 +231,7 @@ "disableTextWrap": false, "editorMode": "builder", "exemplar": true, - "expr": "histogram_quantile(0.95, sum by(le) (rate(app_cart_get_cart_latency_seconds_bucket[$__rate_interval])))", + "expr": "histogram_quantile(0.95, sum by(le) (rate({\"app.cart.get_cart.latency_bucket\"}[$__rate_interval])))", "fullMetaSearch": false, "includeNullMetadata": false, "legendFormat": "p95 GetCart", @@ -324,7 +324,7 @@ "disableTextWrap": false, "editorMode": "builder", "exemplar": true, - "expr": "sum by(le) (rate(app_cart_add_item_latency_seconds_bucket[$__rate_interval]))", + "expr": "sum by(le) (rate({\"app.cart.add_item.latency_bucket\"}[$__rate_interval]))", "format": "heatmap", "fullMetaSearch": false, "includeNullMetadata": false, @@ -428,7 +428,7 @@ "disableTextWrap": false, "editorMode": "builder", "exemplar": true, - "expr": "histogram_quantile(0.95, sum by(le) (rate(app_cart_add_item_latency_seconds_bucket[$__rate_interval])))", + "expr": "histogram_quantile(0.95, sum by(le) (rate({\"app.cart.add_item.latency_bucket\"}[$__rate_interval])))", "fullMetaSearch": false, "includeNullMetadata": false, "legendFormat": "p95 AddItem", diff --git a/src/grafana/provisioning/dashboards/demo/linux-dashboard.json b/src/grafana/provisioning/dashboards/demo/linux-dashboard.json index 2d4fafed49..492b42830b 100644 --- a/src/grafana/provisioning/dashboards/demo/linux-dashboard.json +++ b/src/grafana/provisioning/dashboards/demo/linux-dashboard.json @@ -116,7 +116,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "sum(system_cpu_utilization_ratio{k8s_cluster_name=~\"$k8s_cluster_name\", k8s_node_name=~\"${node_name}\", host_name=~\"$host_name\", job=\"\", state!=\"idle\"})", + "expr": "sum({\"system.cpu.utilization\", k8s_cluster_name=~\"$k8s_cluster_name\", k8s_node_name=~\"${node_name}\", host_name=~\"$host_name\", job=\"\", state!=\"idle\"})", "hide": false, "instant": false, "legendFormat": "__auto", @@ -194,7 +194,7 @@ "disableTextWrap": false, "editorMode": "code", "exemplar": false, - "expr": "system_memory_utilization_ratio{k8s_cluster_name=~\"$k8s_cluster_name\", k8s_node_name=~\"$node_name\", host_name=~\"$host_name\", job=\"\", state=\"used\"}", + "expr": "{\"system.memory.utilization\", k8s_cluster_name=~\"$k8s_cluster_name\", k8s_node_name=~\"$node_name\", host_name=~\"$host_name\", job=\"\", state=\"used\"}", "format": "time_series", "fullMetaSearch": false, "hide": false, @@ -285,7 +285,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "1 \n-\nsum(system_filesystem_usage_bytes{k8s_cluster_name=~\"$k8s_cluster_name\", k8s_node_name=~\"${node_name}\", host_name=~\"$host_name\", state=\"free\"}) \n/ \nsum(system_filesystem_usage_bytes{k8s_cluster_name=~\"$k8s_cluster_name\", k8s_node_name=~\"${node_name}\", host_name=~\"$host_name\"})", + "expr": "1 \n-\nsum({\"system.filesystem.usage\", k8s_cluster_name=~\"$k8s_cluster_name\", k8s_node_name=~\"${node_name}\", host_name=~\"$host_name\", state=\"free\"}) \n/ \nsum({\"system.filesystem.usage\", k8s_cluster_name=~\"$k8s_cluster_name\", k8s_node_name=~\"${node_name}\", host_name=~\"$host_name\"})", "hide": false, "instant": false, "legendFormat": "__auto", @@ -372,7 +372,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "system_cpu_load_average_5m{k8s_cluster_name=~\"$k8s_cluster_name\", k8s_node_name=~\"${node_name}\", host_name=~\"$host_name\"} ", + "expr": "{\"system.cpu.load_average.5m\", k8s_cluster_name=~\"$k8s_cluster_name\", k8s_node_name=~\"${node_name}\", host_name=~\"$host_name\"} ", "format": "time_series", "hide": false, "instant": true, @@ -462,7 +462,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "system_cpu_load_average_15m{k8s_cluster_name=~\"$k8s_cluster_name\", k8s_node_name=~\"${node_name}\", host_name=~\"$host_name\"} ", + "expr": "{\"system.cpu.load_average.15m\", k8s_cluster_name=~\"$k8s_cluster_name\", k8s_node_name=~\"${node_name}\", host_name=~\"$host_name\"} ", "hide": false, "instant": true, "intervalFactor": 1, @@ -550,7 +550,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "sum(system_paging_usage_bytes { k8s_cluster_name=~\"$k8s_cluster_name\", k8s_node_name=~\"${node_name}\", host_name=~\"$host_name\", state=\"used\" })\n/\nsum(system_paging_usage_bytes { k8s_cluster_name=~\"$k8s_cluster_name\", k8s_node_name=~\"${node_name}\", host_name=~\"$host_name\"})", + "expr": "sum( {\"system.paging.usage\", k8s_cluster_name=~\"$k8s_cluster_name\", k8s_node_name=~\"${node_name}\", host_name=~\"$host_name\", state=\"used\" })\n/\nsum( {\"system.paging.usage\", k8s_cluster_name=~\"$k8s_cluster_name\", k8s_node_name=~\"${node_name}\", host_name=~\"$host_name\"})", "instant": true, "intervalFactor": 1, "range": false, @@ -632,7 +632,7 @@ "uid": "fej9ntb4ninswf" }, "editorMode": "code", - "expr": "system_cpu_logical_count{ k8s_cluster_name=~\"$k8s_cluster_name\", k8s_node_name=~\"${node_name}\", host_name=~\"$host_name\", state=\"used\" }", + "expr": "{\"system.cpu.logical_count\", k8s_cluster_name=~\"$k8s_cluster_name\", k8s_node_name=~\"${node_name}\", host_name=~\"$host_name\", state=\"used\" }", "legendFormat": "__auto", "range": true, "refId": "A" @@ -714,7 +714,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "system_memory_limit_bytes{k8s_cluster_name=~\"$k8s_cluster_name\", k8s_node_name=~\"${node_name}\", host_name=~\"$host_name\"}", + "expr": "{\"system.memory.limit\", k8s_cluster_name=~\"$k8s_cluster_name\", k8s_node_name=~\"${node_name}\", host_name=~\"$host_name\"}", "instant": true, "intervalFactor": 1, "legendFormat": "__auto", @@ -799,7 +799,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "sum(system_paging_usage_bytes{k8s_cluster_name=~\"$k8s_cluster_name\", k8s_node_name=~\"${node_name}\", host_name=~\"$host_name\"})", + "expr": "sum({\"system.paging.usage\", k8s_cluster_name=~\"$k8s_cluster_name\", k8s_node_name=~\"${node_name}\", host_name=~\"$host_name\"})", "instant": true, "intervalFactor": 1, "legendFormat": "__auto", @@ -901,7 +901,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "sum(system_filesystem_usage_bytes{k8s_cluster_name=~\"$k8s_cluster_name\", k8s_node_name=~\"${node_name}\", host_name=~\"$host_name\"})", + "expr": "sum({\"system.filesystem.usage\", k8s_cluster_name=~\"$k8s_cluster_name\", k8s_node_name=~\"${node_name}\", host_name=~\"$host_name\"})", "format": "time_series", "hide": false, "instant": true, @@ -987,7 +987,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "system_uptime_seconds{k8s_cluster_name=~\"$k8s_cluster_name\", k8s_node_name=~\"${node_name}\", host_name=~\"$host_name\"}", + "expr": "{\"system.uptime\", k8s_cluster_name=~\"$k8s_cluster_name\", k8s_node_name=~\"${node_name}\", host_name=~\"$host_name\"}", "instant": true, "intervalFactor": 1, "legendFormat": "__auto", @@ -1223,7 +1223,7 @@ "uid": "fej9ntb4ninswf" }, "editorMode": "code", - "expr": "sum (irate(system_cpu_time_seconds_total{k8s_cluster_name=~\"$k8s_cluster_name\", k8s_node_name=~\"${node_name}\", host_name=~\"$host_name\", state=\"system\"}[$__rate_interval])) \n/\nsum ((irate(system_cpu_time_seconds_total{k8s_cluster_name=~\"$k8s_cluster_name\", k8s_node_name=~\"${node_name}\", host_name=~\"$host_name\"}[$__rate_interval])))", + "expr": "sum (irate({\"system.cpu.time\", k8s_cluster_name=~\"$k8s_cluster_name\", k8s_node_name=~\"${node_name}\", host_name=~\"$host_name\", state=\"system\"}[$__rate_interval])) \n/\nsum ((irate({\"system.cpu.time\", k8s_cluster_name=~\"$k8s_cluster_name\", k8s_node_name=~\"${node_name}\", host_name=~\"$host_name\"}[$__rate_interval])))", "format": "time_series", "hide": false, "intervalFactor": 1, @@ -1238,7 +1238,7 @@ "uid": "fej9ntb4ninswf" }, "editorMode": "code", - "expr": "sum (irate(system_cpu_time_seconds_total{kk8s_cluster_name=~\"$k8s_cluster_name\", k8s_node_name=~\"${node_name}\", host_name=~\"$host_name\", state=\"user\"}[$__rate_interval])) \n/ \nsum ((irate(system_cpu_time_seconds_total{k8s_cluster_name=~\"$k8s_cluster_name\", k8s_node_name=~\"${node_name}\", host_name=~\"$host_name\"}[$__rate_interval])))", + "expr": "sum (irate({\"system.cpu.time\",kk8s_cluster_name=~\"$k8s_cluster_name\", k8s_node_name=~\"${node_name}\", host_name=~\"$host_name\", state=\"user\"}[$__rate_interval])) \n/ \nsum ((irate({\"system.cpu.time\", k8s_cluster_name=~\"$k8s_cluster_name\", k8s_node_name=~\"${node_name}\", host_name=~\"$host_name\"}[$__rate_interval])))", "format": "time_series", "hide": false, "intervalFactor": 1, @@ -1253,7 +1253,7 @@ "uid": "fej9ntb4ninswf" }, "editorMode": "code", - "expr": "sum(irate(system_cpu_time_seconds_total{k8s_cluster_name=~\"$k8s_cluster_name\", k8s_node_name=~\"${node_name}\", host_name=~\"$host_name\", state=\"wait\"}[$__rate_interval])) \n/ \nsum ((irate(system_cpu_time_seconds_total{k8s_cluster_name=~\"$k8s_cluster_name\", k8s_node_name=~\"${node_name}\", host_name=~\"$host_name\"}[$__rate_interval])))", + "expr": "sum(irate({\"system.cpu.time\", k8s_cluster_name=~\"$k8s_cluster_name\", k8s_node_name=~\"${node_name}\", host_name=~\"$host_name\", state=\"wait\"}[$__rate_interval])) \n/ \nsum ((irate({\"system.cpu.time\", k8s_cluster_name=~\"$k8s_cluster_name\", k8s_node_name=~\"${node_name}\", host_name=~\"$host_name\"}[$__rate_interval])))", "format": "time_series", "hide": false, "intervalFactor": 1, @@ -1268,7 +1268,7 @@ "uid": "fej9ntb4ninswf" }, "editorMode": "code", - "expr": "sum (irate(system_cpu_time_seconds_total{k8s_cluster_name=~\"$k8s_cluster_name\", k8s_node_name=~\"${node_name}\", host_name=~\"$host_name\", state=~\".*irq\"}[$__rate_interval])) \n/\nsum((irate(system_cpu_time_seconds_total{k8s_cluster_name=~\"$k8s_cluster_name\", k8s_node_name=~\"${node_name}\", host_name=~\"$host_name\"}[$__rate_interval])))", + "expr": "sum (irate({\"system.cpu.time\", k8s_cluster_name=~\"$k8s_cluster_name\", k8s_node_name=~\"${node_name}\", host_name=~\"$host_name\", state=~\".*irq\"}[$__rate_interval])) \n/\nsum((irate({\"system.cpu.time\", k8s_cluster_name=~\"$k8s_cluster_name\", k8s_node_name=~\"${node_name}\", host_name=~\"$host_name\"}[$__rate_interval])))", "format": "time_series", "hide": false, "intervalFactor": 1, @@ -1283,7 +1283,7 @@ "uid": "fej9ntb4ninswf" }, "editorMode": "code", - "expr": "sum(irate(system_cpu_time_seconds_total{k8s_cluster_name=~\"$k8s_cluster_name\", k8s_node_name=~\"${node_name}\", host_name=~\"$host_name\", state!~\".*irq\", state!=\"idle\", state!=\"user\", state!=\"wait\", state!=\"system\"}[$__rate_interval]))\n/\nsum ((irate(system_cpu_time_seconds_total{k8s_cluster_name=~\"$k8s_cluster_name\", k8s_node_name=~\"${node_name}\", host_name=~\"$host_name\"}[$__rate_interval])))", + "expr": "sum(irate({\"system.cpu.time\", k8s_cluster_name=~\"$k8s_cluster_name\", k8s_node_name=~\"${node_name}\", host_name=~\"$host_name\", state!~\".*irq\", state!=\"idle\", state!=\"user\", state!=\"wait\", state!=\"system\"}[$__rate_interval]))\n/\nsum ((irate({\"system.cpu.time\", k8s_cluster_name=~\"$k8s_cluster_name\", k8s_node_name=~\"${node_name}\", host_name=~\"$host_name\"}[$__rate_interval])))", "format": "time_series", "hide": false, "intervalFactor": 1, @@ -1298,7 +1298,7 @@ "uid": "fej9ntb4ninswf" }, "editorMode": "code", - "expr": "sum by(host_name) (irate(system_cpu_time_seconds_total{k8s_cluster_name=~\"$k8s_cluster_name\", k8s_node_name=~\"${node_name}\", host_name=~\"$host_name\", state=\"idle\"}[$__rate_interval])) \n/ \non(host_name) group_left sum by (host_name)((irate(system_cpu_time_seconds_total{k8s_cluster_name=~\"$k8s_cluster_name\", k8s_node_name=~\"${node_name}\", host_name=~\"$host_name\"}[$__rate_interval])))", + "expr": "sum by(host_name) (irate({\"system.cpu.time\", k8s_cluster_name=~\"$k8s_cluster_name\", k8s_node_name=~\"${node_name}\", host_name=~\"$host_name\", state=\"idle\"}[$__rate_interval])) \n/ \non(host_name) group_left sum by (host_name)((irate({\"system.cpu.time\", k8s_cluster_name=~\"$k8s_cluster_name\", k8s_node_name=~\"${node_name}\", host_name=~\"$host_name\"}[$__rate_interval])))", "format": "time_series", "hide": false, "intervalFactor": 1, @@ -1771,7 +1771,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "sum(system_memory_usage_bytes{k8s_cluster_name=~\"$k8s_cluster_name\", k8s_node_name=~\"${node_name}\", host_name=~\"$host_name\"})", + "expr": "sum({\"system.memory.usage\", k8s_cluster_name=~\"$k8s_cluster_name\", k8s_node_name=~\"${node_name}\", host_name=~\"$host_name\"})", "format": "time_series", "hide": false, "intervalFactor": 1, @@ -1786,7 +1786,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "sum(system_memory_usage_bytes{k8s_cluster_name=~\"$k8s_cluster_name\", k8s_node_name=~\"${node_name}\", host_name=~\"$host_name\", state=\"free\"})", + "expr": "sum({\"system.memory.usage\", k8s_cluster_name=~\"$k8s_cluster_name\", k8s_node_name=~\"${node_name}\", host_name=~\"$host_name\", state=\"free\"})", "format": "time_series", "hide": false, "intervalFactor": 1, @@ -1801,7 +1801,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "sum(system_memory_usage_bytes{k8s_cluster_name=~\"$k8s_cluster_name\", k8s_node_name=~\"${node_name}\", host_name=~\"$host_name\", state=~\"cached|buffered\"})", + "expr": "sum({\"system.memory.usage\", k8s_cluster_name=~\"$k8s_cluster_name\", k8s_node_name=~\"${node_name}\", host_name=~\"$host_name\", state=~\"cached|buffered\"})", "format": "time_series", "intervalFactor": 1, "legendFormat": "RAM Cache + Buffer", @@ -1816,7 +1816,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "sum(system_memory_usage_bytes{k8s_cluster_name=~\"$k8s_cluster_name\", k8s_node_name=~\"${node_name}\", host_name=~\"$host_name\", state=\"used\"})", + "expr": "sum({\"system.memory.usage\", k8s_cluster_name=~\"$k8s_cluster_name\", k8s_node_name=~\"${node_name}\", host_name=~\"$host_name\", state=\"used\"})", "format": "time_series", "instant": false, "intervalFactor": 1, @@ -1932,7 +1932,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "sum (rate(system_network_io_bytes_total{k8s_cluster_name=~\"$k8s_cluster_name\", k8s_node_name=~\"${node_name}\", host_name=~\"$host_name\", direction=\"receive\", job=\"\"}[$__rate_interval]))", + "expr": "sum (rate({\"system.network.io\", k8s_cluster_name=~\"$k8s_cluster_name\", k8s_node_name=~\"${node_name}\", host_name=~\"$host_name\", direction=\"receive\", job=\"\"}[$__rate_interval]))", "format": "time_series", "hide": false, "intervalFactor": 1, @@ -1947,7 +1947,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "sum (rate(system_network_io_bytes_total{k8s_cluster_name=~\"$k8s_cluster_name\", k8s_node_name=~\"${node_name}\", host_name=~\"$host_name\", direction=\"transmit\", job=\"\"}[$__rate_interval]))", + "expr": "sum (rate({\"system.network.io\", k8s_cluster_name=~\"$k8s_cluster_name\", k8s_node_name=~\"${node_name}\", host_name=~\"$host_name\", direction=\"transmit\", job=\"\"}[$__rate_interval]))", "format": "time_series", "intervalFactor": 1, "legendFormat": "Transmit", @@ -2062,7 +2062,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "sum(irate(system_disk_io_bytes_total{k8s_cluster_name=~\"$k8s_cluster_name\", k8s_node_name=~\"${node_name}\", host_name=~\"$host_name\", direction=\"read\"}[$__rate_interval]))", + "expr": "sum(irate({\"system.disk.io\", k8s_cluster_name=~\"$k8s_cluster_name\", k8s_node_name=~\"${node_name}\", host_name=~\"$host_name\", direction=\"read\"}[$__rate_interval]))", "format": "time_series", "hide": false, "intervalFactor": 1, @@ -2077,7 +2077,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "sum(irate(system_disk_io_bytes_total{k8s_cluster_name=~\"$k8s_cluster_name\", k8s_node_name=~\"${node_name}\", host_name=~\"$host_name\", direction=\"write\"}[$__rate_interval]))", + "expr": "sum(irate({\"system.disk.io\", k8s_cluster_name=~\"$k8s_cluster_name\", k8s_node_name=~\"${node_name}\", host_name=~\"$host_name\", direction=\"write\"}[$__rate_interval]))", "format": "time_series", "hide": false, "intervalFactor": 1, @@ -2237,7 +2237,7 @@ }, "disableTextWrap": false, "editorMode": "code", - "expr": "sum by(device) (rate(system_network_io_bytes_total{k8s_cluster_name=~\"$k8s_cluster_name\", k8s_node_name=~\"${node_name}\", host_name=~\"$host_name\", job=\"\", direction=\"transmit\"}[$__rate_interval]))", + "expr": "sum by(device) (rate({\"system.network.io\", k8s_cluster_name=~\"$k8s_cluster_name\", k8s_node_name=~\"${node_name}\", host_name=~\"$host_name\", job=\"\", direction=\"transmit\"}[$__rate_interval]))", "fullMetaSearch": false, "hide": false, "includeNullMetadata": true, @@ -2253,7 +2253,7 @@ "uid": "webstore-metrics" }, "editorMode": "code", - "expr": "sum by(device) (rate(system_network_io_bytes_total{k8s_cluster_name=~\"$k8s_cluster_name\", k8s_node_name=~\"${node_name}\", host_name=~\"$host_name\", job=\"\", direction=\"receive\"}[$__rate_interval]))", + "expr": "sum by(device) (rate({\"system.network.io\", k8s_cluster_name=~\"$k8s_cluster_name\", k8s_node_name=~\"${node_name}\", host_name=~\"$host_name\", job=\"\", direction=\"receive\"}[$__rate_interval]))", "hide": false, "instant": false, "legendFormat": "__auto", @@ -2266,7 +2266,7 @@ "uid": "webstore-metrics" }, "editorMode": "code", - "expr": "sum by(device) (rate(system_network_dropped_total{k8s_cluster_name=~\"$k8s_cluster_name\", k8s_node_name=~\"${node_name}\", host_name=~\"$host_name\", job=\"\",direction=\"receive\"}[$__rate_interval]))", + "expr": "sum by(device) (rate({\"system.network.dropped\", k8s_cluster_name=~\"$k8s_cluster_name\", k8s_node_name=~\"${node_name}\", host_name=~\"$host_name\", job=\"\",direction=\"receive\"}[$__rate_interval]))", "hide": false, "instant": false, "legendFormat": "__auto", @@ -2279,7 +2279,7 @@ "uid": "webstore-metrics" }, "editorMode": "code", - "expr": "sum by(device) (rate(system_network_dropped_total{k8s_cluster_name=~\"$k8s_cluster_name\", k8s_node_name=~\"${node_name}\", host_name=~\"$host_name\", job=\"\",direction=\"transmit\"}[$__rate_interval]))", + "expr": "sum by(device) (rate({\"system.network.dropped\", k8s_cluster_name=~\"$k8s_cluster_name\", k8s_node_name=~\"${node_name}\", host_name=~\"$host_name\", job=\"\",direction=\"transmit\"}[$__rate_interval]))", "hide": false, "instant": false, "legendFormat": "__auto", @@ -2292,7 +2292,7 @@ "uid": "webstore-metrics" }, "editorMode": "code", - "expr": "sum by(device) (rate(system_network_errors_total{k8s_cluster_name=~\"$k8s_cluster_name\", k8s_node_name=~\"${node_name}\", host_name=~\"$host_name\", job=\"\",direction=\"receive\"}[$__rate_interval]))", + "expr": "sum by(device) (rate({\"system.network.errors\", k8s_cluster_name=~\"$k8s_cluster_name\", k8s_node_name=~\"${node_name}\", host_name=~\"$host_name\", job=\"\",direction=\"receive\"}[$__rate_interval]))", "hide": false, "instant": false, "legendFormat": "__auto", @@ -2305,7 +2305,7 @@ "uid": "webstore-metrics" }, "editorMode": "code", - "expr": "sum by(device) (rate(system_network_errors_total{k8s_cluster_name=~\"$k8s_cluster_name\", k8s_node_name=~\"${node_name}\", host_name=~\"$host_name\", job=\"\",direction=\"transmit\"}[$__rate_interval]))", + "expr": "sum by(device) (rate({\"system.network.errors\", k8s_cluster_name=~\"$k8s_cluster_name\", k8s_node_name=~\"${node_name}\", host_name=~\"$host_name\", job=\"\",direction=\"transmit\"}[$__rate_interval]))", "hide": false, "instant": false, "legendFormat": "__auto", @@ -2522,7 +2522,7 @@ "disableTextWrap": false, "editorMode": "code", "exemplar": false, - "expr": "sum by(mountpoint) (system_filesystem_usage_bytes{k8s_cluster_name=~\"$k8s_cluster_name\", k8s_node_name=~\"${node_name}\", host_name=~\"$host_name\", state=\"free\"})", + "expr": "sum by(mountpoint) ({\"system.filesystem.usage\", k8s_cluster_name=~\"$k8s_cluster_name\", k8s_node_name=~\"${node_name}\", host_name=~\"$host_name\", state=\"free\"})", "format": "table", "fullMetaSearch": false, "includeNullMetadata": true, @@ -2539,7 +2539,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "sum by(mountpoint) (system_filesystem_usage_bytes{k8s_cluster_name=~\"$k8s_cluster_name\", k8s_node_name=~\"${node_name}\", host_name=~\"$host_name\"})", + "expr": "sum by(mountpoint) ({\"system.filesystem.usage\", k8s_cluster_name=~\"$k8s_cluster_name\", k8s_node_name=~\"${node_name}\", host_name=~\"$host_name\"})", "format": "table", "hide": false, "instant": true, @@ -2722,7 +2722,7 @@ "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, - "definition": "label_values(otelcol_process_uptime,k8s_cluster_name)", + "definition": "label_values({\"process.uptime\"},k8s_cluster_name)", "description": "When deploying PostgreSQL on Kubernetes, name of the Kubernetes cluster. \nFor other deployments, select \"All\". ", "includeAll": true, "label": "K8s Cluster", @@ -2731,7 +2731,7 @@ "options": [], "query": { "qryType": 1, - "query": "label_values(otelcol_process_uptime,k8s_cluster_name)", + "query": "label_values({\"process.uptime\"},k8s_cluster_name)", "refId": "PrometheusVariableQueryEditor-VariableQuery" }, "refresh": 2, @@ -2750,7 +2750,7 @@ "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, - "definition": "label_values(otelcol_process_uptime{k8s_cluster_name=~\"$k8s_cluster_name\"},k8s_node_name)", + "definition": "label_values({\"process.uptime\", k8s_cluster_name=~\"$k8s_cluster_name\"},k8s_node_name)", "description": "When monitoring Kubernetes, name of the K8s node.\nFor other deployments, select \"All\". ", "includeAll": true, "label": "K8s node", @@ -2758,7 +2758,7 @@ "options": [], "query": { "qryType": 1, - "query": "label_values(otelcol_process_uptime{k8s_cluster_name=~\"$k8s_cluster_name\"},k8s_node_name)", + "query": "label_values({\"process.uptime\", k8s_cluster_name=~\"$k8s_cluster_name\"},k8s_node_name)", "refId": "PrometheusVariableQueryEditor-VariableQuery" }, "refresh": 2, @@ -2776,14 +2776,14 @@ "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, - "definition": "label_values(otelcol_process_uptime_seconds_total,host_name)", + "definition": "label_values({\"process.uptime\"},host_name)", "includeAll": true, "label": "Host", "name": "host_name", "options": [], "query": { "qryType": 1, - "query": "label_values(otelcol_process_uptime_seconds_total,host_name)", + "query": "label_values({\"process.uptime\"},host_name)", "refId": "PrometheusVariableQueryEditor-VariableQuery" }, "refresh": 2, @@ -2801,14 +2801,14 @@ "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, - "definition": "query_result(count(otelcol_process_uptime{k8s_cluster_name=~\"$k8s_cluster_name\", k8s_node_name=~\"${node_name}\", host_name=~\"$ip\"}))", + "definition": "query_result(count({\"process.uptime\", k8s_cluster_name=~\"$k8s_cluster_name\", k8s_node_name=~\"${node_name}\", host_name=~\"$ip\"}))", "hide": 2, "label": "host count", "name": "host_count", "options": [], "query": { "qryType": 3, - "query": "query_result(count(otelcol_process_uptime{k8s_cluster_name=~\"$k8s_cluster_name\", k8s_node_name=~\"${node_name}\", host_name=~\"$ip\"}))", + "query": "query_result(count({\"process.uptime\", k8s_cluster_name=~\"$k8s_cluster_name\", k8s_node_name=~\"${node_name}\", host_name=~\"$ip\"}))", "refId": "PrometheusVariableQueryEditor-VariableQuery" }, "refresh": 2, diff --git a/src/grafana/provisioning/dashboards/demo/opentelemetry-collector.json b/src/grafana/provisioning/dashboards/demo/opentelemetry-collector.json index f867efa117..45888de9b2 100644 --- a/src/grafana/provisioning/dashboards/demo/opentelemetry-collector.json +++ b/src/grafana/provisioning/dashboards/demo/opentelemetry-collector.json @@ -653,11 +653,11 @@ }, "editorMode": "code", "exemplar": false, - "expr": "sum(${metric:value}(otelcol_processor_incoming_items${suffix_total}{processor=~\"$processor\",job=\"$job\",otel_signal=\"traces\"}[$__rate_interval])) by (processor $grouping)", + "expr": "sum(${metric:value}(otelcol_processor_incoming_items${suffix_total}{processor=~\"$processor\",job=\"$job\",\"otel.signal\"=\"traces\"}[$__rate_interval])) by (processor $grouping)", "format": "time_series", "interval": "$minstep", "intervalFactor": 1, - "legendFormat": "Incomming: {{processor}} {{service_instance_id}}", + "legendFormat": "Incoming: {{processor}} {{service_instance_id}}", "range": true, "refId": "A" }, @@ -668,7 +668,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "0-sum(${metric:value}(otelcol_processor_outgoing_items${suffix_total}{processor=~\"$processor\",job=\"$job\",otel_signal=\"traces\"}[$__rate_interval])) by (processor $grouping)", + "expr": "0-sum(${metric:value}(otelcol_processor_outgoing_items${suffix_total}{processor=~\"$processor\",job=\"$job\",\"otel.signal\"=\"traces\"}[$__rate_interval])) by (processor $grouping)", "format": "time_series", "hide": false, "interval": "$minstep", @@ -817,11 +817,11 @@ }, "editorMode": "code", "exemplar": false, - "expr": "sum(${metric:value}(otelcol_processor_incoming_items${suffix_total}{processor=~\"$processor\",job=\"$job\",otel_signal=\"metrics\"}[$__rate_interval])) by (processor $grouping)", + "expr": "sum(${metric:value}(otelcol_processor_incoming_items${suffix_total}{processor=~\"$processor\",job=\"$job\",\"otel.signal\"=\"metrics\"}[$__rate_interval])) by (processor $grouping)", "format": "time_series", "interval": "$minstep", "intervalFactor": 1, - "legendFormat": "Incomming: {{processor}} {{service_instance_id}}", + "legendFormat": "Incoming: {{processor}} {{service_instance_id}}", "range": true, "refId": "A" }, @@ -832,7 +832,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "0-sum(${metric:value}(otelcol_processor_outgoing_items${suffix_total}{processor=~\"$processor\",job=\"$job\",otel_signal=\"metrics\"}[$__rate_interval])) by (processor $grouping)", + "expr": "0-sum(${metric:value}(otelcol_processor_outgoing_items${suffix_total}{processor=~\"$processor\",job=\"$job\",\"otel.signal\"=\"metrics\"}[$__rate_interval])) by (processor $grouping)", "format": "time_series", "hide": false, "interval": "$minstep", @@ -981,11 +981,11 @@ }, "editorMode": "code", "exemplar": false, - "expr": "sum(${metric:value}(otelcol_processor_incoming_items${suffix_total}{processor=~\"$processor\",job=\"$job\",otel_signal=\"logs\"}[$__rate_interval])) by (processor $grouping)", + "expr": "sum(${metric:value}(otelcol_processor_incoming_items${suffix_total}{processor=~\"$processor\",job=\"$job\",\"otel.signal\"=\"logs\"}[$__rate_interval])) by (processor $grouping)", "format": "time_series", "interval": "$minstep", "intervalFactor": 1, - "legendFormat": "Incomming: {{processor}} {{service_instance_id}}", + "legendFormat": "Incoming: {{processor}} {{service_instance_id}}", "range": true, "refId": "A" }, @@ -996,7 +996,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "0-sum(${metric:value}(otelcol_processor_outgoing_items${suffix_total}{processor=~\"$processor\",job=\"$job\",otel_signal=\"logs\"}[$__rate_interval])) by (processor $grouping)", + "expr": "0-sum(${metric:value}(otelcol_processor_outgoing_items${suffix_total}{processor=~\"$processor\",job=\"$job\",\"otel.signal\"=\"logs\"}[$__rate_interval])) by (processor $grouping)", "format": "time_series", "hide": false, "interval": "$minstep", @@ -3891,7 +3891,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "max(otelcol_process_uptime${suffix_seconds}${suffix_total}{service_instance_id=~\".*\",job=\"$job\",service_version=\".+\"}) by (service_instance_id,service_name,service_version)\r\nor\r\nmax(\r\n otelcol_process_uptime${suffix_seconds}${suffix_total}{service_instance_id=~\".*\",job=\"$job\"} \r\n * on(job, instance) \r\n group_left(service_version) \r\n (\r\n target_info \r\n * on(job, instance) \r\n group_left \r\n label_replace(target_info{}, \"service_instance_id\", \"$1\", \"instance\", \"(.*)\")\r\n )\r\n) by (service_instance_id, service_name, service_version)", + "expr": "max(otelcol_process_uptime${suffix_seconds}${suffix_total}{service_instance_id=~\".*\",job=\"$job\",service_version=\".+\"}) by (service_instance_id,\"service.name\",service_version)\r\nor\r\nmax(\r\n otelcol_process_uptime${suffix_seconds}${suffix_total}{service_instance_id=~\".*\",job=\"$job\"} \r\n * on(job, instance) \r\n group_left(service_version) \r\n (\r\n target_info \r\n * on(job, instance) \r\n group_left \r\n label_replace(target_info{}, \"service_instance_id\", \"$1\", \"instance\", \"(.*)\")\r\n )\r\n) by (service_instance_id, \"service.name\", service_version)", "format": "table", "hide": false, "instant": true, @@ -4829,7 +4829,7 @@ "uid": "$datasource" }, "editorMode": "code", - "expr": "sum by(rpc_grpc_status_code) (${metric:value}(${prefix:raw}rpc_server_responses_per_rpc_count{job=\"$job\"}[$__rate_interval]))", + "expr": "sum by(\"rpc.grpc.status_code\") (${metric:value}(${prefix:raw}rpc_server_responses_per_rpc_count{job=\"$job\"}[$__rate_interval]))", "instant": false, "legendFormat": "__auto", "range": true, @@ -5140,7 +5140,7 @@ "uid": "$datasource" }, "editorMode": "code", - "expr": "sum by(rpc_grpc_status_code) (${metric:value}(${prefix:raw}rpc_client_responses_per_rpc_count{job=\"$job\"}[$__rate_interval]))", + "expr": "sum by(\"rpc.grpc.status_code\") (${metric:value}(${prefix:raw}rpc_client_responses_per_rpc_count{job=\"$job\"}[$__rate_interval]))", "instant": false, "legendFormat": "__auto", "range": true, @@ -5225,7 +5225,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "sum(increase(${prefix:raw}rpc_server_duration_bucket{job=\"$job\"}[$__rate_interval])) by (le)", + "expr": "sum(increase(${prefix:raw}{\"rpc.server.duration_bucket\", job=\"$job\"}[$__rate_interval])) by (le)", "format": "heatmap", "hide": false, "instant": false, @@ -5313,7 +5313,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "sum(increase(${prefix:raw}rpc_client_duration_bucket{job=\"$job\"}[$__rate_interval])) by (le)", + "expr": "sum(increase(${prefix:raw}{\"rpc.server.duration_bucket\", job=\"$job\"}[$__rate_interval])) by (le)", "format": "heatmap", "hide": false, "instant": false, @@ -5591,7 +5591,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "sum(increase(${prefix:raw}http_server_duration_bucket{job=\"$job\"}[$__rate_interval])) by (le)", + "expr": "sum(increase(${prefix:raw}{\"http.server.duration_bucket\", {job=\"$job\"}[$__rate_interval])) by (le)", "format": "heatmap", "hide": false, "instant": false, @@ -5679,7 +5679,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "sum(increase(${prefix:raw}http_client_duration_bucket{job=\"$job\"}[$__rate_interval])) by (le)", + "expr": "sum(increase(${prefix:raw}{\"http.client.duration_bucket\", job=\"$job\"}[$__rate_interval])) by (le)", "format": "heatmap", "hide": false, "instant": false, @@ -6276,7 +6276,7 @@ "type": "prometheus", "uid": "$datasource" }, - "definition": "query_result({__name__=~\".*.*rpc_server_duration_bucket|.*rpc_client_duration_bucket|.*http_server_duration_bucket|.*http_client_duration_bucket.*\",job=\"$job\"})", + "definition": "query_result({__name__=~\".*.*{\"rpc.server.duration_bucket.*\",job=\"$job\"})", "description": "Some metrics (e.g., RPC, HTTP) may no longer have the otelcol_ prefix. This will detect it. See https://github.com/open-telemetry/opentelemetry-collector/pull/9759", "hide": 2, "includeAll": false, @@ -6285,11 +6285,11 @@ "options": [], "query": { "qryType": 3, - "query": "query_result({__name__=~\".*.*rpc_server_duration_bucket|.*rpc_client_duration_bucket|.*http_server_duration_bucket|.*http_client_duration_bucket.*\",job=\"$job\"})", + "query": "query_result({__name__=~\".*.*{\"rpc.server.duration_bucket.*\",job=\"$job\"})", "refId": "PrometheusVariableQueryEditor-VariableQuery" }, "refresh": 1, - "regex": "/(.*)(rpc|http)_(server|client)_duration_bucket.*{.*/", + "regex": "/(.*){\"(rpc|http).(server|client).duration_bucket\".*/", "type": "query" }, { diff --git a/src/grafana/provisioning/dashboards/demo/postgresql-dashboard.json b/src/grafana/provisioning/dashboards/demo/postgresql-dashboard.json index 2ac9432202..ff9ad6303f 100644 --- a/src/grafana/provisioning/dashboards/demo/postgresql-dashboard.json +++ b/src/grafana/provisioning/dashboards/demo/postgresql-dashboard.json @@ -121,7 +121,7 @@ }, "dsType": "prometheus", "editorMode": "code", - "expr": "sum(irate(postgresql_commits_total{postgresql_database_name=~\"$db\",k8s_cluster_name=~\"$k8s_cluster_name\", k8s_statefulset_name=~\"$k8s_statefulset_name\",host_name=~\"$host_name\"}[$__rate_interval])) + sum(irate(postgresql_rollbacks_total{postgresql_database_name=~\"$db\",k8s_cluster_name=~\"$k8s_cluster_name\", k8s_statefulset_name=~\"$k8s_statefulset_name\",host_name=~\"$host_name\"}[$__rate_interval]))", + "expr": "sum(irate({\"postgresql.commits\", \"postgresql.database.name\"=~\"$db\",k8s_cluster_name=~\"$k8s_cluster_name\", k8s_statefulset_name=~\"$k8s_statefulset_name\",\"host.name\"=~\"$host_name\"}[$__rate_interval])) + sum(irate({\"postgresql.rollbacks\", \"postgresql.database.name\"=~\"$db\",k8s_cluster_name=~\"$k8s_cluster_name\", k8s_statefulset_name=~\"$k8s_statefulset_name\",\"host.name\"=~\"$host_name\"}[$__rate_interval]))", "format": "time_series", "groupBy": [ { @@ -266,7 +266,7 @@ }, "dsType": "prometheus", "editorMode": "code", - "expr": "sum(irate(postgresql_tup_fetched_total{postgresql_database_name=~\"$db\",k8s_cluster_name=~\"$k8s_cluster_name\", k8s_statefulset_name=~\"$k8s_statefulset_name\",host_name=~\"$host_name\"}[$__rate_interval]))", + "expr": "sum(irate({\"postgresql.tup_fetched\", \"postgresql.database.name\"=~\"$db\",k8s_cluster_name=~\"$k8s_cluster_name\", k8s_statefulset_name=~\"$k8s_statefulset_name\",\"host.name\"=~\"$host_name\"}[$__rate_interval]))", "format": "time_series", "groupBy": [ { @@ -325,7 +325,7 @@ }, "dsType": "prometheus", "editorMode": "code", - "expr": "sum(irate(postgresql_tup_returned_total{postgresql_database_name=~\"$db\",k8s_cluster_name=~\"$k8s_cluster_name\", k8s_statefulset_name=~\"$k8s_statefulset_name\",host_name=~\"$host_name\"}[$__rate_interval]))", + "expr": "sum(irate({\"postgresql.tup_returned\", \"postgresql.database.name\"=~\"$db\",k8s_cluster_name=~\"$k8s_cluster_name\", k8s_statefulset_name=~\"$k8s_statefulset_name\",\"host.name\"=~\"$host_name\"}[$__rate_interval]))", "format": "time_series", "groupBy": [ { @@ -385,7 +385,7 @@ }, "dsType": "prometheus", "editorMode": "code", - "expr": "sum(irate(postgresql_tup_inserted_total{postgresql_database_name=~\"$db\",k8s_cluster_name=~\"$k8s_cluster_name\", k8s_statefulset_name=~\"$k8s_statefulset_name\",host_name=~\"$host_name\"}[$__rate_interval]))", + "expr": "sum(irate({\"postgresql.tup_inserted\", \"postgresql.database.name\"=~\"$db\",k8s_cluster_name=~\"$k8s_cluster_name\", k8s_statefulset_name=~\"$k8s_statefulset_name\",\"host.name\"=~\"$host_name\"}[$__rate_interval]))", "format": "time_series", "groupBy": [ { @@ -445,7 +445,7 @@ }, "dsType": "prometheus", "editorMode": "code", - "expr": "sum(irate(postgresql_tup_updated_total{dpostgresql_database_name=~\"$db\",k8s_cluster_name=~\"$k8s_cluster_name\", k8s_statefulset_name=~\"$k8s_statefulset_name\",host_name=~\"$host_name\"}[$__rate_interval]))", + "expr": "sum(irate({\"postgresql.tup_updated\", \"postgresql.database.name\"=~\"$db\",k8s_cluster_name=~\"$k8s_cluster_name\", k8s_statefulset_name=~\"$k8s_statefulset_name\",\"host.name\"=~\"$host_name\"}[$__rate_interval]))", "format": "time_series", "groupBy": [ { @@ -506,7 +506,7 @@ }, "dsType": "prometheus", "editorMode": "code", - "expr": "sum(irate(postgresql_tup_deleted_total{postgresql_database_name=~\"$db\",k8s_cluster_name=~\"$k8s_cluster_name\", k8s_statefulset_name=~\"$k8s_statefulset_name\",host_name=~\"$host_name\"}[$__rate_interval]))", + "expr": "sum(irate({\"postgresql.tup_deleted\", \"postgresql.database.name\"=~\"$db\",k8s_cluster_name=~\"$k8s_cluster_name\", k8s_statefulset_name=~\"$k8s_statefulset_name\",\"host.name\"=~\"$host_name\"}[$__rate_interval]))", "format": "time_series", "groupBy": [ { @@ -653,7 +653,7 @@ }, "dsType": "prometheus", "editorMode": "code", - "expr": "irate(postgresql_bgwriter_buffers_allocated_total{host_name=~\"$host_name\", k8s_cluster_name=~\"$k8s_cluster_name\", k8s_statefulset_name=~\"$k8s_statefulset_name\"}[$__rate_interval])", + "expr": "irate({ \"postgresql.bgwriter.buffers.allocated\", \"host.name\"=~\"$host_name\", k8s_cluster_name=~\"$k8s_cluster_name\", k8s_statefulset_name=~\"$k8s_statefulset_name\"}[$__rate_interval])", "format": "time_series", "groupBy": [ { @@ -710,7 +710,7 @@ }, "disableTextWrap": false, "editorMode": "code", - "expr": "irate(postgresql_bgwriter_buffers_writes_total{k8s_cluster_name=~\"$k8s_cluster_name\", k8s_statefulset_name=~\"$k8s_statefulset_name\", host_name=~\"$host_name\"}[$__interval])", + "expr": "irate({ \"postgresql.bgwriter.buffers.writes\", k8s_cluster_name=~\"$k8s_cluster_name\", k8s_statefulset_name=~\"$k8s_statefulset_name\", \"host.name\"=~\"$host_name\"}[$__interval])", "fullMetaSearch": false, "hide": false, "includeNullMetadata": true, @@ -840,7 +840,7 @@ }, "dsType": "prometheus", "editorMode": "code", - "expr": "irate(postgresql_bgwriter_checkpoint_count_total{k8s_cluster_name=~\"$k8s_cluster_name\", k8s_statefulset_name=~\"$k8s_statefulset_name\", host_name=~\"$host_name\"}[$__rate_interval])", + "expr": "irate({ \"postgresql.bgwriter.checkpoint.count\", k8s_cluster_name=~\"$k8s_cluster_name\", k8s_statefulset_name=~\"$k8s_statefulset_name\", \"host.name\"=~\"$host_name\"}[$__rate_interval])", "format": "time_series", "groupBy": [ { @@ -1025,7 +1025,7 @@ }, "dsType": "prometheus", "editorMode": "code", - "expr": "sum(postgresql_deadlocks_total{postgresql_database_name=~\"$db\",k8s_cluster_name=~\"$k8s_cluster_name\", k8s_statefulset_name=~\"$k8s_statefulset_name\", host_name=~\"$host_name\"})", + "expr": "sum({ \"postgresql.deadlocks\", \"postgresql.database.name\"=~\"$db\",k8s_cluster_name=~\"$k8s_cluster_name\", k8s_statefulset_name=~\"$k8s_statefulset_name\", \"host.name\"=~\"$host_name\"})", "format": "time_series", "groupBy": [ { @@ -1082,7 +1082,7 @@ }, "dsType": "prometheus", "editorMode": "code", - "expr": "sum(postgresql_conflicts_total{postgresql_database_name=~\"$db\",k8s_cluster_name=~\"$k8s_cluster_name\", k8s_statefulset_name=~\"$k8s_statefulset_name\",host_name=~\"$host_name\"})", + "expr": "sum({ \"postgresql.conflicts\", \"postgresql.database.name\"=~\"$db\",k8s_cluster_name=~\"$k8s_cluster_name\", k8s_statefulset_name=~\"$k8s_statefulset_name\",\"host.name\"=~\"$host_name\"})", "format": "time_series", "groupBy": [ { @@ -1225,9 +1225,9 @@ "uid": "$datasource" }, "editorMode": "code", - "expr": "round(\n sum by (postgresql_database_name) (\n rate(\n postgresql_blks_hit_total{\n postgresql_database_name=~\"$db\",\n k8s_cluster_name=~\"$k8s_cluster_name\", k8s_statefulset_name=~\"$k8s_statefulset_name\",\n host_name=~\"$host_name\"\n }[$__rate_interval]\n )\n )\n /\n (\n sum by (postgresql_database_name) (\n rate(\n postgresql_blks_hit_total{\n postgresql_database_name=~\"$db\",\n k8s_cluster_name=~\"$k8s_cluster_name\", k8s_statefulset_name=~\"$k8s_statefulset_name\",\n host_name=~\"$host_name\"\n }[$__rate_interval]\n )\n )\n +\n sum by (postgresql_database_name) (\n rate(\n postgresql_blks_read_total{\n postgresql_database_name=~\"$db\",\n k8s_cluster_name=~\"$k8s_cluster_name\", k8s_statefulset_name=~\"$k8s_statefulset_name\",\n host_name=~\"$host_name\"\n }[$__rate_interval]\n )\n )\n ) * 100,\n 0.001\n)", + "expr": "round(\n sum by (\"postgresql.database.name\") (\n rate(\n {\"postgresql.blks_hit\", \n \"postgresql.database.name\"=~\"$db\",\n k8s_cluster_name=~\"$k8s_cluster_name\", k8s_statefulset_name=~\"$k8s_statefulset_name\",\n \"host.name\"=~\"$host_name\"\n }[$__rate_interval]\n )\n )\n /\n (\n sum by (\"postgresql.database.name\") (\n rate(\n {\"postgresql.blks_hit\", \n \"postgresql.database.name\"=~\"$db\",\n k8s_cluster_name=~\"$k8s_cluster_name\", k8s_statefulset_name=~\"$k8s_statefulset_name\",\n \"host.name\"=~\"$host_name\"\n }[$__rate_interval]\n )\n )\n +\n sum by (\"postgresql.database.name\") (\n rate(\n {\"postgresql.blks_read\",\n \"postgresql.database.name\"=~\"$db\",\n k8s_cluster_name=~\"$k8s_cluster_name\", k8s_statefulset_name=~\"$k8s_statefulset_name\",\n \"host.name\"=~\"$host_name\"\n }[$__rate_interval]\n )\n )\n ) * 100,\n 0.001\n)", "format": "time_series", - "legendFormat": "{{postgresql_database_name}} - cache hit ratio", + "legendFormat": "{{\"postgresql.database.name\"}} - cache hit ratio", "range": true, "refId": "A", "step": 240 @@ -1323,10 +1323,10 @@ "uid": "$datasource" }, "editorMode": "code", - "expr": "postgresql_backends{postgresql_database_name=~\"$db\",k8s_cluster_name=~\"$k8s_cluster_name\", k8s_statefulset_name=~\"$k8s_statefulset_name\", host_name=~\"$host_name\"}", + "expr": "{\"postgresql.backends\",\"postgresql.database.name\"=~\"$db\",k8s_cluster_name=~\"$k8s_cluster_name\", k8s_statefulset_name=~\"$k8s_statefulset_name\", \"host.name\"=~\"$host_name\"}", "format": "time_series", "intervalFactor": 2, - "legendFormat": "{{postgresql_database_name}} - connections", + "legendFormat": "{{\"postgresql.database.name\"}} - connections", "range": true, "refId": "A", "step": 240 @@ -1369,7 +1369,7 @@ "type": "prometheus", "uid": "webstore-metrics" }, - "definition": "label_values(postgresql_table_count,k8s_cluster_name)", + "definition": "label_values({\"postgresql.table.count\"},k8s_cluster_name)", "description": "When deploying PostgreSQL on Kubernetes, name of the Kubernetes cluster. \nFor other deployments, select \"All\". ", "includeAll": true, "label": "K8s Cluster", @@ -1378,7 +1378,7 @@ "options": [], "query": { "qryType": 1, - "query": "label_values(postgresql_table_count,k8s_cluster_name)", + "query": "label_values({\"postgresql.table.count\"},k8s_cluster_name)", "refId": "PrometheusVariableQueryEditor-VariableQuery" }, "refresh": 2, @@ -1392,7 +1392,7 @@ "text": "", "value": "" }, - "definition": "label_values(postgresql_table_count{k8s_cluster_name=~\"$k8s_cluster_name\"},k8s_statefulset_name)", + "definition": "label_values({\"postgresql.table.count\", k8s_cluster_name=~\"$k8s_cluster_name\"},k8s_statefulset_name)", "description": "When deploying on Kubernetes, name of the `StatefulSet` of the PostgreSQL deployment (e.g. `my-pg-cluster`).\nFor other deployments, select \"All\". ", "includeAll": true, "label": "K8s Statefulset", @@ -1401,7 +1401,7 @@ "options": [], "query": { "qryType": 1, - "query": "label_values(postgresql_table_count{k8s_cluster_name=~\"$k8s_cluster_name\"},k8s_statefulset_name)", + "query": "label_values({\"postgresql.table.count\", k8s_cluster_name=~\"$k8s_cluster_name\"},k8s_statefulset_name)", "refId": "PrometheusVariableQueryEditor-VariableQuery" }, "refresh": 1, @@ -1419,7 +1419,7 @@ "datasource": { "uid": "$datasource" }, - "definition": "label_values(postgresql_table_count{k8s_cluster_name=~\"$k8s_cluster_name\", k8s_statefulset_name=~\"$k8s_statefulset_name\"},host_name)", + "definition": "label_values({\"postgresql.table.count\", k8s_cluster_name=~\"$k8s_cluster_name\", k8s_statefulset_name=~\"$k8s_statefulset_name\"},host_name)", "description": "When deploying PostgreSQL on VMs, name on the host on which the database is deployed.\nFor other deployments, select \"All\". ", "includeAll": true, "label": "Host", @@ -1428,7 +1428,7 @@ "options": [], "query": { "qryType": 1, - "query": "label_values(postgresql_table_count{k8s_cluster_name=~\"$k8s_cluster_name\", k8s_statefulset_name=~\"$k8s_statefulset_name\"},host_name)", + "query": "label_values({\"postgresql.table.count\", k8s_cluster_name=~\"$k8s_cluster_name\", k8s_statefulset_name=~\"$k8s_statefulset_name\"},host_name)", "refId": "PrometheusVariableQueryEditor-VariableQuery" }, "refresh": 2, @@ -1446,14 +1446,14 @@ "type": "prometheus", "uid": "webstore-metrics" }, - "definition": "label_values(postgresql_table_count{host_name=~\"$host_name\", postgresql_database_name!~\"template.*|postgres\", k8s_cluster_name=~\"$k8s_cluster_name\", k8s_statefulset_name=~\"$k8s_statefulset_name\"},postgresql_database_name)", + "definition": "label_values({\"postgresql.table.count\", \"host.name\"=~\"$host_name\", \"postgresql.database.name\"!~\"template.*|postgres\", k8s_cluster_name=~\"$k8s_cluster_name\", k8s_statefulset_name=~\"$k8s_statefulset_name\"},\"postgresql.database.name\")", "includeAll": true, "label": "Database", "name": "db", "options": [], "query": { "qryType": 1, - "query": "label_values(postgresql_table_count{host_name=~\"$host_name\", postgresql_database_name!~\"template.*|postgres\", k8s_cluster_name=~\"$k8s_cluster_name\", k8s_statefulset_name=~\"$k8s_statefulset_name\"},postgresql_database_name)", + "query": "label_values({\"postgresql.table.count\", \"host.name\"=~\"$host_name\", \"postgresql.database.name\"!~\"template.*|postgres\", k8s_cluster_name=~\"$k8s_cluster_name\", k8s_statefulset_name=~\"$k8s_statefulset_name\"},\"postgresql.database.name\")", "refId": "PrometheusVariableQueryEditor-VariableQuery" }, "refresh": 2, diff --git a/src/grafana/provisioning/dashboards/demo/spanmetrics-dashboard.json b/src/grafana/provisioning/dashboards/demo/spanmetrics-dashboard.json index 4a26602786..8f1f1ec474 100644 --- a/src/grafana/provisioning/dashboards/demo/spanmetrics-dashboard.json +++ b/src/grafana/provisioning/dashboards/demo/spanmetrics-dashboard.json @@ -138,7 +138,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "topk(7,histogram_quantile(0.50, sum(rate(traces_span_metrics_duration_milliseconds_bucket{service_name=~\"$service\", span_name=~\"$span_name\"}[$__rate_interval])) by (le,service_name)))", + "expr": "topk(7,histogram_quantile(0.50, sum(rate({\"traces.span.metrics.duration_bucket\", \"service.name\"=~\"$service\", span_name=~\"$span_name\"}[$__rate_interval])) by (le,\"service.name\")))", "format": "time_series", "hide": true, "instant": false, @@ -154,7 +154,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "topk(7,histogram_quantile(0.95, sum(rate(traces_span_metrics_duration_milliseconds_bucket{service_name=~\"$service\", span_name=~\"$span_name\"}[$__range])) by (le,service_name)))", + "expr": "topk(7,histogram_quantile(0.95, sum(rate({\"traces.span.metrics.duration_bucket\", \"service.name\"=~\"$service\", span_name=~\"$span_name\"}[$__range])) by (le,\"service.name\")))", "hide": false, "instant": true, "interval": "", @@ -169,7 +169,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "histogram_quantile(0.99, sum(rate(traces_span_metrics_duration_milliseconds_bucket{service_name=~\"$service\", span_name=~\"$span_name\"}[$__rate_interval])) by (le,service_name))", + "expr": "histogram_quantile(0.99, sum(rate({\"traces.span.metrics.duration_bucket\", \"service.name\"=~\"$service\", span_name=~\"$span_name\"}[$__rate_interval])) by (le,\"service.name\"))", "hide": true, "interval": "", "legendFormat": "quantile99", @@ -183,7 +183,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "histogram_quantile(0.999, sum(rate(traces_span_metrics_duration_milliseconds_bucket{service_name=~\"$service\", span_name=~\"$span_name\"}[$__rate_interval])) by (le,service_name))", + "expr": "histogram_quantile(0.999, sum(rate({\"traces.span.metrics.duration_bucket\", \"service.name\"=~\"$service\", span_name=~\"$span_name\"}[$__rate_interval])) by (le,\"service.name\"))", "hide": true, "interval": "", "legendFormat": "quantile999", @@ -273,7 +273,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "topk(7,sum by (service_name) (rate(traces_span_metrics_calls_total{service_name=~\"$service\", span_name=~\"$span_name\"}[$__range])))", + "expr": "topk(7,sum by (\"service.name\") (rate({\"traces.span.metrics.calls\", \"service.name\"=~\"$service\", span_name=~\"$span_name\"}[$__range])))", "format": "time_series", "instant": true, "interval": "", @@ -360,7 +360,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "topk(7,sum(rate(traces_span_metrics_calls_total{status_code=\"STATUS_CODE_ERROR\",service_name=~\"$service\", span_name=~\"$span_name\"}[$__range])) by (service_name))", + "expr": "topk(7,sum(rate({\"traces.span.metrics.calls\", status_code=\"STATUS_CODE_ERROR\",\"service.name\"=~\"$service\", span_name=~\"$span_name\"}[$__range])) by (\"service.name\"))", "instant": true, "interval": "", "legendFormat": "{{service_name}}", @@ -528,7 +528,7 @@ "uid": "webstore-metrics" }, "exemplar": false, - "expr": "topk(7, sum(rate(traces_span_metrics_calls_total{service_name=~\"$service\", span_name=~\"$span_name\"}[$__range])) by (span_name,service_name)) ", + "expr": "topk(7, sum(rate({\"traces.span.metrics.calls\", \"service.name\"=~\"$service\", span_name=~\"$span_name\"}[$__range])) by (span_name,\"service.name\")) ", "format": "table", "instant": true, "interval": "", @@ -541,7 +541,7 @@ "uid": "webstore-metrics" }, "exemplar": false, - "expr": "topk(7, sum(rate(traces_span_metrics_calls_total{status_code=\"STATUS_CODE_ERROR\",service_name=~\"$service\", span_name=~\"$span_name\"}[$__range])) by (span_name,service_name))", + "expr": "topk(7, sum(rate({\"traces.span.metrics.calls\", status_code=\"STATUS_CODE_ERROR\",\"service.name\"=~\"$service\", span_name=~\"$span_name\"}[$__range])) by (span_name,\"service.name\"))", "format": "table", "hide": false, "instant": true, @@ -569,8 +569,8 @@ "renameByName": { "Value #Error Rate": "Error Rate", "Value #Rate": "Rate", - "service_name 1": "Rate in Service", - "service_name 2": "Error Rate in Service" + "\"service.name\" 1": "Rate in Service", + "\"service.name\" 2": "Error Rate in Service" } } }, @@ -724,7 +724,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "topk(7,histogram_quantile(0.50, sum(rate(traces_span_metrics_duration_milliseconds_bucket{service_name=~\"$service\", span_name=~\"$span_name\"}[$__rate_interval])) by (le,service_name)))", + "expr": "topk(7,histogram_quantile(0.50, sum(rate({\"traces.span.metrics.duration_bucket\", \"service.name\"=~\"$service\", span_name=~\"$span_name\"}[$__rate_interval])) by (le,\"service.name\")))", "format": "time_series", "hide": true, "instant": false, @@ -740,7 +740,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "topk(7,histogram_quantile(0.95, sum(rate(traces_span_metrics_duration_milliseconds_bucket{service_name=~\"$service\", span_name=~\"$span_name\"}[$__range])) by (le,span_name)))", + "expr": "topk(7,histogram_quantile(0.95, sum(rate({\"traces.span.metrics.duration_bucket\", \"service.name\"=~\"$service\", span_name=~\"$span_name\"}[$__range])) by (le,span_name)))", "hide": false, "instant": true, "interval": "", @@ -755,7 +755,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "histogram_quantile(0.99, sum(rate(traces_span_metrics_duration_milliseconds_bucket{service_name=~\"$service\", span_name=~\"$span_name\"}[$__rate_interval])) by (le,service_name))", + "expr": "histogram_quantile(0.99, sum(rate({\"traces.span.metrics.duration_bucket\", \"service.name\"=~\"$service\", span_name=~\"$span_name\"}[$__rate_interval])) by (le,\"service.name\"))", "hide": true, "interval": "", "legendFormat": "quantile99", @@ -769,7 +769,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "histogram_quantile(0.999, sum(rate(traces_span_metrics_duration_milliseconds_bucket{service_name=~\"$service\", span_name=~\"$span_name\"}[$__rate_interval])) by (le,service_name))", + "expr": "histogram_quantile(0.999, sum(rate({\"traces.span.metrics.duration_bucket\", \"service.name\"=~\"$service\", span_name=~\"$span_name\"}[$__rate_interval])) by (le,\"service.name\"))", "hide": true, "interval": "", "legendFormat": "quantile999", @@ -849,7 +849,7 @@ }, "editorMode": "code", "exemplar": false, - "expr": "topk(7, sum by (span_name,service_name)(increase(traces_span_metrics_duration_milliseconds_sum{service_name=~\"${service}\", span_name=~\"$span_name\"}[5m]) / increase(traces_span_metrics_duration_milliseconds_count{service_name=~\"${service}\",span_name=~\"$span_name\"}[5m\n])))", + "expr": "topk(7, sum by (span_name,\"service.name\")(increase({\"traces.span.metrics.duration_sum\", \"service.name\"=~\"${service}\", span_name=~\"$span_name\"}[5m]) / increase({\"traces.span.metrics.duration_count\",\"service.name\"=~\"${service}\",span_name=~\"$span_name\"}[5m\n])))", "instant": true, "interval": "", "legendFormat": "{{span_name}} [{{service_name}}]", @@ -954,7 +954,7 @@ }, "editorMode": "code", "exemplar": true, - "expr": "topk(7,sum by (span_name,service_name)(increase(traces_span_metrics_duration_milliseconds_sum{service_name=~\"$service\", span_name=~\"$span_name\"}[$__rate_interval]) / increase(traces_span_metrics_duration_milliseconds_count{service_name=~\"$service\", span_name=~\"$span_name\"}[$__rate_interval])))", + "expr": "topk(7,sum by (span_name,\"service.name\")(increase({\"traces.span.metrics.duration_sum\", \"service.name\"=~\"$service\", span_name=~\"$span_name\"}[$__rate_interval]) / increase({\"traces.span.metrics.duration_count\",\"service.name\"=~\"$service\", span_name=~\"$span_name\"}[$__rate_interval])))", "instant": false, "interval": "", "legendFormat": "[{{service_name}}] {{span_name}}", @@ -982,17 +982,17 @@ "type": "prometheus", "uid": "webstore-metrics" }, - "definition": "query_result(count by (service_name)(count_over_time(traces_span_metrics_calls_total[$__range])))", + "definition": "query_result(count by (\"service.name\")(count_over_time({\"traces.span.metrics.calls\"}[$__range])))", "includeAll": true, "multi": true, "name": "service", "options": [], "query": { - "query": "query_result(count by (service_name)(count_over_time(traces_span_metrics_calls_total[$__range])))", + "query": "query_result(count by (\"service.name\")(count_over_time({\"traces.span.metrics.calls\"}[$__range])))", "refId": "StandardVariableQuery" }, "refresh": 2, - "regex": "/.*service_name=\"(.*)\".*/", + "regex": "/.*\"service.name\"=\"(.*)\".*/", "sort": 1, "type": "query" }, @@ -1006,13 +1006,13 @@ "type": "prometheus", "uid": "webstore-metrics" }, - "definition": "query_result(sum ({__name__=~\".*traces_span_metrics_calls_total\",service_name=~\"$service\"}) by (span_name))", + "definition": "query_result(sum ({__name__=~\".*traces.span.metrics.calls\",\"service.name\"=~\"$service\"}) by (span_name))", "includeAll": true, "multi": true, "name": "span_name", "options": [], "query": { - "query": "query_result(sum ({__name__=~\".*traces_span_metrics_calls_total\",service_name=~\"$service\"}) by (span_name))", + "query": "query_result(sum ({__name__=~\".*traces.span.metrics.calls\",\"service.name\"=~\"$service\"}) by (span_name))", "refId": "StandardVariableQuery" }, "refresh": 2, diff --git a/src/prometheus/prometheus-config.yaml b/src/prometheus/prometheus-config.yaml index 212f5b8775..bc59af1186 100644 --- a/src/prometheus/prometheus-config.yaml +++ b/src/prometheus/prometheus-config.yaml @@ -7,6 +7,7 @@ global: otlp: keep_identifying_resource_attributes: true + translation_strategy: NoTranslation promote_resource_attributes: - service.instance.id - service.name