v1.9.6

grafana · Aug 20, 2024 · d4458bd · d4458bd
2 parents de0d625 + 4a39518
commit d4458bd
Show file tree

Hide file tree

Showing 26 changed files with 409 additions and 1,771 deletions.
diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml
@@ -168,7 +168,6 @@ jobs:
 
       - name: Tilt CI - standard E2E tests
         shell: bash
-        if: ${{ inputs.run-expensive-tests == false }}
         env:
           GRAFANA_VERSION: ${{ inputs.grafana_version }}
           BROWSERS: ${{ inputs.browsers }}

diff --git a/.github/workflows/expensive-e2e-tests.yml b/.github/workflows/expensive-e2e-tests.yml
@@ -14,21 +14,8 @@ jobs:
     strategy:
       matrix:
         grafana_version:
-          # OnCall doesn't work on the following versions of Grafana
-          # - 8.5.22
-          # - 9.0.0
-          # - 9.1.0
-
-          # 10.0.11 is the earliest version where things work
-          # - 9.2.20
-          # - 9.3.16
-          # - 9.4.13
-          # - 9.5.7
           - 10.1.7
           - 10.3.3
-          # TODO: fix issues with running e2e tests against Grafana v10.2.x and v10.3.x
-          # - 10.2.4
-          # - latest
       fail-fast: false
       # Run one version at a time to avoid the issue when SMS notification are bundled together for multiple versions
       # running at the same time (the affected test is in grafana-plugin/e2e-tests/alerts/sms.test.ts)
@@ -37,10 +24,6 @@ jobs:
     with:
       grafana_version: ${{ matrix.grafana_version }}
       run-expensive-tests: true
-      # TODO: fix issues with some tests on firefox and webkit
-      # example CI build with firefox/webkit failing tests
-      # https://github.com/grafana/oncall/actions/runs/8022194346/job/21915964672#step:19:905
-      # browsers: "chromium firefox webkit"
       browsers: "chromium"
     secrets: inherit
 

diff --git a/Tiltfile b/Tiltfile
@@ -17,6 +17,8 @@ DOCKER_REGISTRY = "localhost:63628/"
 
 load("ext://docker_build_sub", "docker_build_sub")
 
+grafana_deps = ["grafana-oncall-app-provisioning-configmap", "build-ui", "build-oncall-plugin-backend"]
+
 def get_profiles():
     profiles = os.getenv('ONCALL_PROFILES', 'grafana,plugin,backend,tests')
     return profiles.split(',')
@@ -38,6 +40,9 @@ def extra_env():
         "ONCALL_API_URL": "http://oncall-dev-engine:8080"
     }
 
+def extra_deps():
+    return grafana_deps
+
 
 allow_k8s_contexts(["kind-kind"])
 
@@ -107,7 +112,7 @@ def load_grafana():
             context="grafana-plugin",
             plugin_files=["grafana-plugin/src/plugin.json"],
             namespace="default",
-            deps=["grafana-oncall-app-provisioning-configmap", "build-ui", "build-oncall-plugin-backend"],
+            deps=grafana_deps,
             extra_env={
                 "GF_SECURITY_ADMIN_PASSWORD": "oncall",
                 "GF_SECURITY_ADMIN_USER": "oncall",

diff --git a/engine/requirements-dev.txt b/engine/requirements-dev.txt
@@ -6,7 +6,7 @@ asgiref==3.7.2
     #   django
 celery-types==0.18.0
     # via -r requirements-dev.in
-certifi==2024.2.2
+certifi==2024.7.4
     # via
     #   -c requirements.txt
     #   requests
@@ -25,14 +25,14 @@ django==4.2.15
     #   django-stubs-ext
 django-filter-stubs==0.1.3
     # via -r requirements-dev.in
-django-stubs[compatible-mypy]==4.2.2
+django-stubs==4.2.2
     # via
     #   -r requirements-dev.in
     #   django-filter-stubs
     #   djangorestframework-stubs
 django-stubs-ext==4.2.7
     # via django-stubs
-djangorestframework-stubs[compatible-mypy]==3.14.2
+djangorestframework-stubs==3.14.2
     # via
     #   -r requirements-dev.in
     #   django-filter-stubs
@@ -52,7 +52,7 @@ httpretty==1.1.4
     # via -r requirements-dev.in
 identify==2.5.34
     # via pre-commit
-idna==3.6
+idna==3.7
     # via
     #   -c requirements.txt
     #   requests
@@ -96,7 +96,7 @@ pytest-django==4.8.0
     # via -r requirements-dev.in
 pytest-factoryboy==2.7.0
     # via -r requirements-dev.in
-pytest-xdist[psutil]==3.6.1
+pytest-xdist==3.6.1
     # via -r requirements-dev.in
 python-dateutil==2.8.2
     # via
@@ -110,6 +110,10 @@ requests==2.32.3
     # via
     #   -c requirements.txt
     #   djangorestframework-stubs
+setuptools==73.0.0
+    # via
+    #   -c requirements.txt
+    #   nodeenv
 six==1.16.0
     # via
     #   -c requirements.txt

diff --git a/engine/requirements.in b/engine/requirements.in
@@ -64,3 +64,7 @@ whitenoise==5.3.0
 google-api-python-client==2.122.0
 google-auth-httplib2==0.2.0
 google-auth-oauthlib==1.2.0
+# we are manually pinning idna to 3.7 to fix CVE-2024-3651
+# requests==2.32.3 is installing idna==3.6 but supports idna>=2.5,<4
+# https://github.com/psf/requests/blob/v2.32.3/setup.py#L63
+idna==3.7
diff --git a/engine/requirements.txt b/engine/requirements.txt
@@ -34,9 +34,9 @@ cachetools==4.2.2
     # via
     #   google-auth
     #   python-telegram-bot
-celery[redis]==5.3.1
+celery==5.3.1
     # via -r requirements.in
-certifi==2024.2.2
+certifi==2024.7.4
     # via
     #   python-telegram-bot
     #   requests
@@ -157,7 +157,7 @@ firebase-admin==5.4.0
     # via fcm-django
 flask==3.0.2
     # via slack-export-viewer
-google-api-core[grpc]==2.17.0
+google-api-core==2.17.0
     # via
     #   firebase-admin
     #   google-api-python-client
@@ -224,8 +224,10 @@ icalendar==5.0.10
     #   -r requirements.in
     #   recurring-ical-events
     #   x-wr-timezone
-idna==3.6
-    # via requests
+idna==3.7
+    # via
+    #   -r requirements.in
+    #   requests
 importlib-metadata==6.11.0
     # via opentelemetry-api
 inflection==0.5.1
@@ -415,6 +417,10 @@ rsa==4.9
     # via google-auth
 s3transfer==0.10.0
     # via boto3
+setuptools==73.0.0
+    # via
+    #   apscheduler
+    #   opentelemetry-instrumentation
 six==1.16.0
     # via
     #   apscheduler

diff --git a/grafana-plugin/package.json b/grafana-plugin/package.json
@@ -27,7 +27,6 @@
     "watch": "NODE_ENV=development webpack -w -c ./webpack.config.ts --env development",
     "sign": "npx --yes @grafana/sign-plugin@latest",
     "start": "yarn watch",
-    "plop": "plop",
     "setversion": "setversion",
     "typecheck": "tsc --noEmit",
     "typecheck:watch": "yarn typecheck --watch --preserveWatchOutput false",
@@ -105,7 +104,6 @@
     "mailslurp-client": "^15.14.1",
     "moment-timezone": "^0.5.35",
     "openapi-typescript": "^7.0.0-next.4",
-    "plop": "^2.7.4",
     "postcss-loader": "^7.0.1",
     "prettier": "^2.8.7",
     "react-test-renderer": "^18.0.2",
@@ -177,5 +175,8 @@
     "throttle-debounce": "^2.1.0",
     "tinycolor2": "^1.6.0",
     "tslib": "2.5.3"
+  },
+  "resolutions": {
+    "braces": "3.0.3"
   }
 }
diff --git a/grafana-plugin/plopfile.js b/grafana-plugin/plopfile.js
diff --git a/grafana-plugin/tools/plop/generators/createComponentFiles.js b/grafana-plugin/tools/plop/generators/createComponentFiles.js
diff --git a/grafana-plugin/tools/plop/generators/createContainerFiles.js b/grafana-plugin/tools/plop/generators/createContainerFiles.js
diff --git a/grafana-plugin/tools/plop/generators/createModelFiles.js b/grafana-plugin/tools/plop/generators/createModelFiles.js
diff --git a/grafana-plugin/tools/plop/helpers/configNeeded.js b/grafana-plugin/tools/plop/helpers/configNeeded.js
diff --git a/grafana-plugin/tools/plop/prompts/componentPrompts.js b/grafana-plugin/tools/plop/prompts/componentPrompts.js
diff --git a/grafana-plugin/tools/plop/prompts/containerPrompts.js b/grafana-plugin/tools/plop/prompts/containerPrompts.js
diff --git a/grafana-plugin/tools/plop/prompts/modelPrompts.js b/grafana-plugin/tools/plop/prompts/modelPrompts.js
diff --git a/grafana-plugin/tools/plop/templates/Component/ClassComponent.tsx.hbs b/grafana-plugin/tools/plop/templates/Component/ClassComponent.tsx.hbs