Merge branch 'monitoring-schema' into 'master'

fix missing keys for monitoring.sso configuration

See merge request !2707

chart/values.schema.json

@@ -721,10 +721,34 @@
                   "type": "string"
                 },
                 "allow_sign_up": {
-                  "type": "string"
+                  "type": "boolean"
                 },
                 "role_attribute_path": {
                   "type": "string"
+                },
+                "token_url": {
+                  "type": "string"
+                },
+                "auth_url": {
+                  "type": "string"
+                },
+                "api_url": {
+                  "type": "string"
+                },
+                "tls_client_ca": {
+                  "type": "string"
+                },
+                "tls_skip_verify_insecure": {
+                  "type": "boolean"
+                },
+                "tls_client_cert": {
+                  "type": "string"
+                },
+                "tls_client_key": {
+                  "type": "string"
+                },
+                "allowed_domains": {
+                  "type": "string"
                 }
               },
               "additionalProperties": false

chart/values.yaml

@@ -878,7 +878,7 @@ monitoring:
       # -- Grafana OIDC client scopes, comma separated, see https://grafana.com/docs/grafana/latest/auth/generic-oauth/
       scopes: ""
 
-      allow_sign_up: "true"
+      allow_sign_up: true
 
       role_attribute_path: "Viewer"
       # -- Other options available, see package Documentation.

schema/schema.bats

@@ -105,4 +105,10 @@ invalid() {
     diag "Testing extra keys for core package $package"
     assert_equal "$status" "1"
   done
+}
+
+# Test monitoring schema validation
+@test "helm template validate monitoring schema" {
+  valid monitoring
+  invalid monitoring
 }
\ No newline at end of file

schema/test-values/monitoring/invalid/sso.yaml

+monitoring:
+  sso:
+    grafana:
+      foo: bar

schema/test-values/monitoring/valid/sso.yaml

+monitoring:
+  sso:
+    grafana:
+      client_id: grafana
+      client_secret: secret 
+      scopes: Grafana
+      allow_sign_up: true
+      role_attribute_path: Viewer
+      auth_url: https://login.dso.mil/auth/realms/baby-yoda/protocol/openid-connect/auth
+      token_url: https://login.dso.mil/auth/realms/baby-yoda/protocol/openid-connect/token
+      api_url: https://login.dso.mil/auth/realms/baby-yoda/protocol/openid-connect/userinfo
+      allowed_domains: foo.com bar.com
+      tls_client_ca: ""
+      tls_skip_verify_insecure: false
+      tls_client_cert: ""
+      tls_client_key: ""
\ No newline at end of file