From 0c610bb4967e37078c7712ad08fbf0b3bdc913a4 Mon Sep 17 00:00:00 2001 From: Chris Elias Date: Mon, 11 Dec 2023 09:41:36 -0500 Subject: [PATCH 1/5] add tempo node graph to tempo datasource --- monitoring/grafana-datasource-tempo.yaml | 8 +++++++- monitoring/values-prom-operator.yaml | 10 ++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/monitoring/grafana-datasource-tempo.yaml b/monitoring/grafana-datasource-tempo.yaml index 209206d6..7e26707d 100644 --- a/monitoring/grafana-datasource-tempo.yaml +++ b/monitoring/grafana-datasource-tempo.yaml @@ -11,5 +11,11 @@ grafana: url: http://v4m-tempo:3100 isDefault: false editable: true + jsonData: + serviceMap: + datasourceUid: prometheus + nodeGraph: + enabled: true + # search: + # hide: false apiVersion: 1 - diff --git a/monitoring/values-prom-operator.yaml b/monitoring/values-prom-operator.yaml index 1ac377d5..051dcc3d 100644 --- a/monitoring/values-prom-operator.yaml +++ b/monitoring/values-prom-operator.yaml @@ -237,3 +237,13 @@ grafana: - kubernetes.io/pvc-protection # subPath: "" # existingClaim: + +tempo: + metricsGenerator: + enabled: true + config: + service_graphs_max_items: 15000 + + global_overrides: + metrics_generator_processors: + - service-graphs From caab9aecb935ed4716767e8a5a9ac8b7e7424552 Mon Sep 17 00:00:00 2001 From: Chris Elias Date: Mon, 11 Dec 2023 09:45:23 -0500 Subject: [PATCH 2/5] update changelog --- CHANGELOG.md | 3 +++ monitoring/grafana-datasource-tempo.yaml | 2 -- monitoring/values-prom-operator.yaml | 2 -- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 082411ad..dc8bb78b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,9 @@ * [REMOVAL] Removed the deprecated, experimental, script getlogs.sh from repo. The Python-based getlogs.py script should be used instead. * [FIX] Corrected bug in change_internal_password.sh that prevented it from working +* **Tracing** + * [FEATURE] Added node graph feature to Tempo data source in Grafana for more visualization options + ## Version 1.2.19 (14NOV2023) * **Overall** diff --git a/monitoring/grafana-datasource-tempo.yaml b/monitoring/grafana-datasource-tempo.yaml index 7e26707d..881cd1cd 100644 --- a/monitoring/grafana-datasource-tempo.yaml +++ b/monitoring/grafana-datasource-tempo.yaml @@ -16,6 +16,4 @@ grafana: datasourceUid: prometheus nodeGraph: enabled: true - # search: - # hide: false apiVersion: 1 diff --git a/monitoring/values-prom-operator.yaml b/monitoring/values-prom-operator.yaml index 051dcc3d..030f1b23 100644 --- a/monitoring/values-prom-operator.yaml +++ b/monitoring/values-prom-operator.yaml @@ -241,8 +241,6 @@ grafana: tempo: metricsGenerator: enabled: true - config: - service_graphs_max_items: 15000 global_overrides: metrics_generator_processors: From 3f653dd31cc053d1548e52b8adc3f8df240770b4 Mon Sep 17 00:00:00 2001 From: Greg Smith <65406958+gsmith-sas@users.noreply.github.com> Date: Mon, 11 Dec 2023 10:16:43 -0500 Subject: [PATCH 3/5] Update ARTIFACT_INVENTORY.md and CHANGELOG.md to reflect monitoring upgrades (#588) --- ARTIFACT_INVENTORY.md | 2 +- CHANGELOG.md | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ARTIFACT_INVENTORY.md b/ARTIFACT_INVENTORY.md index 97d28f4e..bb6b02f2 100644 --- a/ARTIFACT_INVENTORY.md +++ b/ARTIFACT_INVENTORY.md @@ -53,6 +53,6 @@ This table identifies the Helm charts used by SAS Viya Monitoring for Kubernetes | Logging | Fluent Bit| fluent| fluent-bit| 0.40.0| fluent-bit-0.40.0.tgz | Logging | OpenSearch| opensearch| opensearch| 2.15.0| opensearch-2.15.0.tgz | Logging | OpenSearch Dashboard| opensearch| opensearch-dashboards| 2.13.0| opensearch-dashboards-2.13.0.tgz -| Metrics | Grafana (on OpenShift)| grafana| grafana| 6.58.9| grafana-6.58.9.tgz +| Metrics | Grafana (on OpenShift)| grafana| grafana| 7.0.4| grafana-7.0.4.tgz | Metrics | Kube Prometheus Stack| prometheus-community| kube-prometheus-stack| 54.0.1| kube-prometheus-stack-54.0.1.tgz | Metrics | Prometheus Pushgateway| prometheus-community| prometheus-pushgateway| 2.4.2| prometheus-pushgateway-2.4.2.tgz diff --git a/CHANGELOG.md b/CHANGELOG.md index 082411ad..7f13549c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,14 @@ * **Metrics** * [CHANGE] Disabled init-chown-data initContainer that started with Grafana. + * [UPGRADE] Kube-prometheus-stack has been upgraded from version 48.3.2 to 54.0.1 + * [UPGRADE] Prometheus has been upgraded from version 2.46.0 to 2.47.1 + * [UPGRADE] Prometheus Operator has been upgraded from version v0.67.1 to v0.69.1 + * [UPGRADE] Grafana has been upgraded from version 10.0.3 to 10.2.1 + * [UPGRADE] Kube State Metrics has been upgraded from version 2.9.2 to 2.10.0 + * [UPGRADE] K8s-sidecar used with Grafana has been upgraded from version 1.25.0 to 1.25.2 + * [UPGRADE] Node Exporter has been upgraded from version 1.6.1 to 1.7.0 + * [UPGRADE] Prometheus Pushgateway has been upgraded from version 2.4.1 to 2.4.2 * **Logging** * [UPGRADE] Upgraded OpenSearch/OpenSearch Dashboards from 2.8.0 to 2.10.0 From 9e3de0f5fbe70521ab665e14897b5617777b6cdc Mon Sep 17 00:00:00 2001 From: Chris Elias Date: Mon, 11 Dec 2023 11:25:01 -0500 Subject: [PATCH 4/5] move tempo values to tempo values file --- monitoring/values-prom-operator.yaml | 7 ------- monitoring/values-tempo.yaml | 8 ++++++-- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/monitoring/values-prom-operator.yaml b/monitoring/values-prom-operator.yaml index 030f1b23..737b8535 100644 --- a/monitoring/values-prom-operator.yaml +++ b/monitoring/values-prom-operator.yaml @@ -238,10 +238,3 @@ grafana: # subPath: "" # existingClaim: -tempo: - metricsGenerator: - enabled: true - - global_overrides: - metrics_generator_processors: - - service-graphs diff --git a/monitoring/values-tempo.yaml b/monitoring/values-tempo.yaml index 78640073..c0c351ec 100644 --- a/monitoring/values-tempo.yaml +++ b/monitoring/values-tempo.yaml @@ -13,8 +13,12 @@ tempo: reportingEnabled: false metricsGenerator: # -- If true, enables Tempo's metrics generator (https://grafana.com/docs/tempo/next/metrics-generator/) - enabled: false - remoteWriteUrl: "http://prometheus.monitoring:9090/api/v1/write" + enabled: true + remoteWriteUrl: "http://v4m-prometheus.monitoring:9090/api/v1/write" + + # global_overrides: + # metrics_generator_processors: + # - service-graphs retention: 24h From 1d47b0cb3b374a96580462d6152d11b96e3d6199 Mon Sep 17 00:00:00 2001 From: Chris Elias Date: Tue, 12 Dec 2023 09:15:14 -0500 Subject: [PATCH 5/5] adding github action to check shell code --- .github/workflows/ci.yml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 .github/workflows/ci.yml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 00000000..3fe5a44f --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,17 @@ +name: checkshell +on: + - pull_request +jobs: + sh-checker: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - name: Run the sh-checker + uses: luizm/action-sh-checker@master + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + SHELLCHECK_OPTS: -e SC1004 # exclude some shellcheck warnings. + SHFMT_OPTS: -s # arguments to shfmt. + with: + sh_checker_only_diff: true # only run against files that were updated + sh_checker_comment: true # include results as github comment