Merge branch 'main' into sas-arke-dashboard

.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

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

CHANGELOG.md

@@ -7,6 +7,14 @@
 * **Metrics**
   * [CHANGE] Disabled init-chown-data initContainer that started with Grafana.
   * [FEATURE] Added a Grafana dashboard that monitors SAS Arke events.
+  * [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
@@ -15,6 +23,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**

monitoring/grafana-datasource-tempo.yaml

@@ -11,5 +11,9 @@ grafana:
         url: http://v4m-tempo:3100
         isDefault: false
         editable: true
+        jsonData:
+          serviceMap:
+            datasourceUid: prometheus
+          nodeGraph:
+            enabled: true
         apiVersion: 1
-

monitoring/values-prom-operator.yaml

@@ -237,3 +237,4 @@ grafana:
       - kubernetes.io/pvc-protection
     # subPath: ""
     # existingClaim:
+

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