Merge branch 'grafana-plugins' into 'master'

Grafana Plugins, NetworkPolicies, latest IB updates

Closes #1053, #1165, and platform-one/big-bang/apps/core/monitoring#77

See merge request platform-one/big-bang/bigbang!1264

chart/templates/monitoring/values.yaml

@@ -24,6 +24,8 @@ networkPolicies:
     {{- $default := dict "app" (dig "gateways" $gateway "ingressGateway" nil .Values.istio) "istio" nil }}
     {{- toYaml (dig "values" "gateways" $gateway "selector" $default .Values.istio) | nindent 4 }}
 
+openshift: {{ .Values.openshift }}
+
 minioOperator:
   enabled: {{ .Values.addons.minioOperator.enabled }}
 
@@ -292,19 +294,6 @@ grafana:
       {{- list "tls_client_key" .tls_client_key | include "bigbang.addValueIfSet" | indent 6 }}
     {{- end }}
 
-  {{- if or .Values.loki.enabled .Values.addons.gitlabRunner.enabled $redisDatasource .Values.addons.vault.enabled }}
-  plugins:
-  {{- if $redisDatasource }}
-    - redis-datasource
-  {{- end }}
-  {{- if or .Values.loki.enabled .Values.addons.vault.enabled }}
-    - grafana-piechart-panel
-  {{- end }}
-  {{- if .Values.addons.gitlabRunner.enabled }}
-    - grafana-polystat-panel
-  {{- end }}
-  {{- end }}
-
 prometheus-node-exporter:
   image:
     pullPolicy: {{ .Values.imagePullPolicy }}

chart/values.yaml

@@ -578,7 +578,7 @@ monitoring:
   git:
     repo: https://repo1.dso.mil/platform-one/big-bang/apps/core/monitoring.git
     path: "./chart"
-    tag: "35.0.3-bb.0"
+    tag: "35.2.0-bb.0"
 
   # -- Flux reconciliation overrides specifically for the Monitoring Package
   flux:

tests/test-values.yaml

@@ -159,6 +159,7 @@ gatekeeper:
           - mattermost/mattermost-cypress-test
           - keycloak/keycloak-cypress-test
           - jaeger/jaeger-operator-cypress-test
+          - monitoring/kube-prometheus-stack-cypress-test
           # Allow kyverno test vectors for Helm test
           - default/restrict-host-path-mount-.?
           - default/restrict-host-path-write-.?
@@ -251,6 +252,7 @@ gatekeeper:
           - mattermost/mattermost-cypress-test
           - keycloak/keycloak-cypress-test
           - jaeger/jaeger-operator-cypress-test
+          - monitoring/kube-prometheus-stack-cypress-test
           # Allow kyverno test vectors for Helm test
           - default/restrict-host-path-mount-.?
           - default/restrict-host-path-write-.?
@@ -356,6 +358,7 @@ kyvernopolicies:
               - nexus-repository-manager
               - keycloak
               - jaeger
+              - monitoring
               names:
               - "*-cypress-test*"
         parameters:
@@ -373,6 +376,7 @@ kyvernopolicies:
               - nexus-repository-manager
               - keycloak
               - jaeger
+              - monitoring
               names:
               - "*-cypress-test*"
         parameters:
@@ -405,6 +409,7 @@ kyvernopolicies:
               - nexus-repository-manager
               - keycloak
               - jaeger
+              - monitoring
               names:
               - "*-cypress-test*"
       update-image-pull-policy: