Merge branch 'PMM-2.0' into PMM-12545-dbaas-removal-ui

Percona-Lab · Dec 27, 2023 · be24a08 · be24a08
2 parents 93eecce + 58835f9
commit be24a08
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 9 deletions.
diff --git a/.github/workflows/pmm2-testsuite.yml b/.github/workflows/pmm2-testsuite.yml
@@ -263,7 +263,7 @@ jobs:
 
       - name: Generate and Attach the report
         if: ${{ always() }}
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: "report-${{ matrix.db-type }}"
           path: ./pmm-ui-tests/cli/test-report

diff --git a/.github/workflows/trivy_scan.yml b/.github/workflows/trivy_scan.yml
@@ -59,7 +59,7 @@ jobs:
 
       - name: Archive trivy scan results
         if: always()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ env.REPORT }}
           path: ${{ env.REPORT }}

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2.41.0
+2.41.1
diff --git a/requirements.txt b/requirements.txt
@@ -1,3 +1,3 @@
 pyaml==23.9.5
-GitPython==3.1.37
+GitPython==3.1.40
 PyGithub==1.59.1
diff --git a/sources/grafana-dashboards b/sources/grafana-dashboards
diff --git a/sources/grafana/src/github.com/grafana/grafana b/sources/grafana/src/github.com/grafana/grafana
diff --git a/sources/mysqld_exporter/src/github.com/percona/mysqld_exporter b/sources/mysqld_exporter/src/github.com/percona/mysqld_exporter
diff --git a/sources/pmm-ui-tests/src/github.com/percona/pmm-ui-tests b/sources/pmm-ui-tests/src/github.com/percona/pmm-ui-tests
diff --git a/sources/pmm/src/github.com/percona/pmm b/sources/pmm/src/github.com/percona/pmm
+8 −8		.github/workflows/build.yml
+0 −38		panels/yesoreyeram-boomtable-panel/CHANGELOG.md
+0 −1		panels/yesoreyeram-boomtable-panel/LAST_UPDATED
+0 −62		panels/yesoreyeram-boomtable-panel/MANIFEST.txt
+0 −440		panels/yesoreyeram-boomtable-panel/README.md
+0 −67		panels/yesoreyeram-boomtable-panel/app/GrafanaUtils.js
+0 −74		panels/yesoreyeram-boomtable-panel/app/app.js
+0 −10		panels/yesoreyeram-boomtable-panel/app/boom/Boom.interface.js
+0 −90		panels/yesoreyeram-boomtable-panel/app/boom/BoomOutput.js
+0 −101		panels/yesoreyeram-boomtable-panel/app/boom/BoomPattern.js
+0 −109		panels/yesoreyeram-boomtable-panel/app/boom/BoomSeries.js
+0 −119		panels/yesoreyeram-boomtable-panel/app/boom/BoomSeriesUtils.js
+0 −22		panels/yesoreyeram-boomtable-panel/app/boom/BoomTimeBasedThreshold.js
+0 −300		panels/yesoreyeram-boomtable-panel/app/boom/BoomUtils.js
+0 −45		panels/yesoreyeram-boomtable-panel/app/boom/index.js
+0 −78		panels/yesoreyeram-boomtable-panel/app/config.js
+0 −45		panels/yesoreyeram-boomtable-panel/css/default.dark.css
+0 −45		panels/yesoreyeram-boomtable-panel/css/default.light.css
+0 −195		panels/yesoreyeram-boomtable-panel/module.js
+0 −605		panels/yesoreyeram-boomtable-panel/partials/editor.html
+0 −40		panels/yesoreyeram-boomtable-panel/partials/module.html
+0 −37		panels/yesoreyeram-boomtable-panel/plugin.json
+ −		panels/yesoreyeram-boomtable-panel/src/img/azure-monitor-usage.png
+ −		panels/yesoreyeram-boomtable-panel/src/img/debug-ui.png
+ −		panels/yesoreyeram-boomtable-panel/src/img/editor-1.png
+ −		panels/yesoreyeram-boomtable-panel/src/img/editor-2.png
+ −		panels/yesoreyeram-boomtable-panel/src/img/editor-default.png
+ −		panels/yesoreyeram-boomtable-panel/src/img/filters.png
+ −		panels/yesoreyeram-boomtable-panel/src/img/font-awesome-examples.png
+ −		panels/yesoreyeram-boomtable-panel/src/img/img-transform-example.png
+ −		panels/yesoreyeram-boomtable-panel/src/img/influx-usage.png
+ −		panels/yesoreyeram-boomtable-panel/src/img/metrics.png
+ −		panels/yesoreyeram-boomtable-panel/src/img/panel.png
+ −		panels/yesoreyeram-boomtable-panel/src/img/panels-fa.png
+ −		panels/yesoreyeram-boomtable-panel/src/img/prometheus-usage.png
+ −		panels/yesoreyeram-boomtable-panel/src/img/time-based-thresholds.png
+ −		panels/yesoreyeram-boomtable-panel/src/img/version-5.0.2.png
+0 −227		panels/yesoreyeram-boomtable-panel/tests/BoomSeries.spec.js
+8 −2		pmm-app/src/pmm-qan/panel/provider/provider.tsx
+1 −1		pr.codecept.js
+11 −1		tests/helper/file_helper.js
+6 −1		tests/pages/api/grafanaAPI.js
+4 −4		tests/pages/homePage.js
+53 −3		tests/upgradePMM_test.js