Merge branch 'nebari-dev:main' into eks-cluster-encryption

nebari-dev · Oct 23, 2024 · 319f947 · 319f947
2 parents e76058b + 42e0b15
commit 319f947
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 17 deletions.
diff --git a/...template/modules/kubernetes/services/monitoring/dashboards/Main/jupyterhub_dashboard.json b/...template/modules/kubernetes/services/monitoring/dashboards/Main/jupyterhub_dashboard.json
@@ -1292,14 +1292,14 @@
         "datasource": {
           "uid": "$PROMETHEUS_DS"
         },
-        "definition": "",
+        "definition": "label_values({service=\"hub\"},namespace)",
         "hide": 0,
-        "includeAll": true,
+        "includeAll": false,
         "multi": true,
         "name": "hub",
         "options": [],
         "query": {
-          "query": "label_values(kube_service_labels{service=\"hub\"}, namespace)",
+          "query": "label_values({service=\"hub\"},namespace)",
           "refId": "Prometheus-hub-Variable-Query"
         },
         "refresh": 1,

diff --git a/tests/tests_unit/test_cli_validate.py b/tests/tests_unit/test_cli_validate.py
@@ -114,26 +114,20 @@ def test_cli_validate_from_env():
             ["validate", "--config", tmp_file.resolve()],
             env={"NEBARI_SECRET__amazon_web_services__kubernetes_version": "1.20"},
         )
-        try:
-            assert 0 == valid_result.exit_code
-            assert not valid_result.exception
-            assert "Successfully validated configuration" in valid_result.stdout
-        except AssertionError:
-            print(valid_result.stdout)
-            raise
+
+        assert 0 == valid_result.exit_code
+        assert not valid_result.exception
+        assert "Successfully validated configuration" in valid_result.stdout
 
         invalid_result = runner.invoke(
             app,
             ["validate", "--config", tmp_file.resolve()],
             env={"NEBARI_SECRET__amazon_web_services__kubernetes_version": "1.0"},
         )
-        try:
-            assert 1 == invalid_result.exit_code
-            assert invalid_result.exception
-            assert "Invalid `kubernetes-version`" in invalid_result.stdout
-        except AssertionError:
-            print(invalid_result.stdout)
-            raise
+
+        assert 1 == invalid_result.exit_code
+        assert invalid_result.exception
+        assert "Invalid `kubernetes-version`" in invalid_result.stdout
 
 
 @pytest.mark.parametrize(