From a5af42627e134ff81bb4e7fd16db8cfabfb05949 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20M=C3=BCller?= Date: Fri, 3 May 2024 10:32:27 +0200 Subject: [PATCH] chore: change plugin name --- .config/webpack/constants.ts | 2 +- .github/workflows/release.yml | 10 +++++----- .github/workflows/validate.yml | 6 +++--- .gitignore | 2 +- README.md | 4 ++-- docker-compose.yaml | 4 ++-- kubernetes/helm/grafana-geomap-wms/values.yaml | 8 ++++---- kubernetes/values-grafana.yaml | 8 ++++---- package-lock.json | 4 ++-- package.json | 4 ++-- provisioning/dashboards/dashboard_e2e.json | 2 +- src/plugin.json | 2 +- 12 files changed, 28 insertions(+), 28 deletions(-) diff --git a/.config/webpack/constants.ts b/.config/webpack/constants.ts index 6b897c3..48b1d5f 100644 --- a/.config/webpack/constants.ts +++ b/.config/webpack/constants.ts @@ -1,2 +1,2 @@ export const SOURCE_DIR = 'src'; -export const DIST_DIR = 'geomap-wms-panel'; +export const DIST_DIR = 'felixrelleum-geomapwms-panel'; diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 8d93e81..e487821 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -73,9 +73,9 @@ jobs: - run: npm install - run: npm run build - name: Zip the dist folder - run: zip -qr geomap-wms-panel.zip geomap-wms-panel + run: zip -qr felixrelleum-geomapwms-panel.zip felixrelleum-geomapwms-panel - name: Run validator - run: npx --yes @grafana/plugin-validator@latest -sourceCodeUri file://. geomap-wms-panel.zip # https://github.com/grafana/plugin-validator + run: npx --yes @grafana/plugin-validator@latest -sourceCodeUri file://. felixrelleum-geomapwms-panel.zip # https://github.com/grafana/plugin-validator release: runs-on: ubuntu-latest @@ -105,9 +105,9 @@ jobs: run: | sudo apt-get install jq - export GRAFANA_PLUGIN_ID=$(cat geomap-wms-panel/plugin.json | jq -r .id) - export GRAFANA_PLUGIN_VERSION=$(cat geomap-wms-panel/plugin.json | jq -r .info.version) - export GRAFANA_PLUGIN_TYPE=$(cat geomap-wms-panel/plugin.json | jq -r .type) + export GRAFANA_PLUGIN_ID=$(cat felixrelleum-geomapwms-panel/plugin.json | jq -r .id) + export GRAFANA_PLUGIN_VERSION=$(cat felixrelleum-geomapwms-panel/plugin.json | jq -r .info.version) + export GRAFANA_PLUGIN_TYPE=$(cat felixrelleum-geomapwms-panel/plugin.json | jq -r .type) export GRAFANA_PLUGIN_ARTIFACT=${GRAFANA_PLUGIN_ID}-${GRAFANA_PLUGIN_VERSION}.zip export GRAFANA_PLUGIN_ARTIFACT_SHA1SUM=${GRAFANA_PLUGIN_ARTIFACT}.sha1 diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml index 22f9821..658525b 100644 --- a/.github/workflows/validate.yml +++ b/.github/workflows/validate.yml @@ -24,10 +24,10 @@ jobs: - name: Zip the plugin uses: montudor/action-zip@v1 with: - args: zip -qr geomap-wms-panel.zip geomap-wms-panel + args: zip -qr felixrelleum-geomapwms-panel.zip felixrelleum-geomapwms-panel - name: Run validator - run: npx --yes @grafana/plugin-validator@latest -sourceCodeUri file://. geomap-wms-panel.zip # https://github.com/grafana/plugin-validator + run: npx --yes @grafana/plugin-validator@latest -sourceCodeUri file://. felixrelleum-geomapwms-panel.zip # https://github.com/grafana/plugin-validator - name: Clean up - run: rm -r geomap-wms-panel.zip + run: rm -r felixrelleum-geomapwms-panel.zip diff --git a/.gitignore b/.gitignore index c57fefb..47ed39a 100644 --- a/.gitignore +++ b/.gitignore @@ -28,7 +28,7 @@ e2e-results/ orchestracities-map-panel-1.4.0.zip orchestracities-map-panel-1.4.0 plugin-validator -/geomap-wms-panel/ +/felixrelleum-geomapwms-panel/ # Editors .idea diff --git a/README.md b/README.md index 992f5eb..cedb1ba 100644 --- a/README.md +++ b/README.md @@ -137,8 +137,8 @@ npm run dev ``` ## Deploy the (unsigned) plugin to the docker container (for debugging) -The packed plugin (either [production build](#building-the-plugin) or [development build](#building-the-plugin-for-developmentdebugging)) is found in the output folder `./geomap-wms-panel`. -To allow grafana to load an _unsigned_ plugin the container environment variable `GF_PLUGINS_ALLOW_UNSIGNED_PLUGINS=` must be set to "geomap-wms-panel". +The packed plugin (either [production build](#building-the-plugin) or [development build](#building-the-plugin-for-developmentdebugging)) is found in the output folder `./felixrelleum-geomapwms-panel`. +To allow grafana to load an _unsigned_ plugin the container environment variable `GF_PLUGINS_ALLOW_UNSIGNED_PLUGINS=` must be set to "felixrelleum-geomapwms-panel". Additionally it is required to configure a _bind mount_ of the _plugins_ container directory to the host filesystem where the bundled Geomap WMS Panel Plugin is located. **Shortcut:** diff --git a/docker-compose.yaml b/docker-compose.yaml index c8833da..33a7bde 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -5,7 +5,7 @@ services: image: grafana/grafana-oss # grafana/grafana-oss:10.0.2 container_name: 'geomap-wms-map-panel' environment: - - GF_PLUGINS_ALLOW_LOADING_UNSIGNED_PLUGINS=felixrelleum-geomap-wms-panel + - GF_PLUGINS_ALLOW_LOADING_UNSIGNED_PLUGINS=felixrelleum-geomapwms-panel - GF_INSTALL_PLUGINS=marcusolsson-json-datasource,iosb-sensorthings-datasource # - GF_USERS_DEFAULT_LANGUAGE=de - GF_LOG_MODE=console file @@ -18,7 +18,7 @@ services: ports: - 3000:3000/tcp volumes: - - ./geomap-wms-panel:/var/lib/grafana/plugins/geomap-wms-panel + - ./felixrelleum-geomapwms-panel:/var/lib/grafana/plugins/felixrelleum-geomapwms-panel # - ../dashboards:/var/lib/grafana/dashboards - ./provisioning/datasources:/etc/grafana/provisioning/datasources - ./provisioning/dashboards:/etc/grafana/provisioning/dashboards \ No newline at end of file diff --git a/kubernetes/helm/grafana-geomap-wms/values.yaml b/kubernetes/helm/grafana-geomap-wms/values.yaml index 6a5ec74..cbe8f01 100644 --- a/kubernetes/helm/grafana-geomap-wms/values.yaml +++ b/kubernetes/helm/grafana-geomap-wms/values.yaml @@ -59,7 +59,7 @@ grafana: # Since grafana is a subchart those variables must be in an object 'gra grafana.ini: plugins: - allow_loading_unsigned_plugins: geomap-wms-panel + allow_loading_unsigned_plugins: felixrelleum-geomapwms-panel datasources: datasource.yaml: @@ -95,13 +95,13 @@ grafana: # Since grafana is a subchart those variables must be in an object 'gra # Needs to be added to make available for extraVolumeMounts: https://github.com/grafana/helm-charts/blob/ec78147220603e8fba6c77ba4e2a13288edf67e3/charts/grafana/templates/_pod.tpl#L1250 extraVolumes: - name: task-pv-claim-geomap-wms - mountPath: /var/lib/grafana/plugins/geomap-wms-panel + mountPath: /var/lib/grafana/plugins/felixrelleum-geomapwms-panel readOnly: true existingClaim: task-pv-claim-geomap-wms extraVolumeMounts: - name: task-pv-claim-geomap-wms - mountPath: /var/lib/grafana/plugins/geomap-wms-panel + mountPath: /var/lib/grafana/plugins/felixrelleum-geomapwms-panel readOnly: true existingClaim: task-pv-claim-geomap-wms @@ -122,7 +122,7 @@ grafana: # Since grafana is a subchart those variables must be in an object 'gra - /bin/mkdir - -p - --mode=777 - - /var/lib/grafana/plugins/geomap-wms-panel + - /var/lib/grafana/plugins/felixrelleum-geomapwms-panel volumeMounts: - name: storage mountPath: "/var/lib/grafana" diff --git a/kubernetes/values-grafana.yaml b/kubernetes/values-grafana.yaml index f60299b..fc392cb 100644 --- a/kubernetes/values-grafana.yaml +++ b/kubernetes/values-grafana.yaml @@ -57,7 +57,7 @@ egress: grafana.ini: plugins: - allow_loading_unsigned_plugins: geomap-wms-panel + allow_loading_unsigned_plugins: felixrelleum-geomapwms-panel datasources: datasource.yaml: @@ -91,13 +91,13 @@ env: extraVolumes: - name: task-pv-claim-geomap-wms - mountPath: /var/lib/grafana/plugins/geomap-wms-panel + mountPath: /var/lib/grafana/plugins/felixrelleum-geomapwms-panel readOnly: true existingClaim: task-pv-claim-geomap-wms extraVolumeMounts: - name: task-pv-claim-geomap-wms - mountPath: /var/lib/grafana/plugins/geomap-wms-panel + mountPath: /var/lib/grafana/plugins/felixrelleum-geomapwms-panel readOnly: true existingClaim: task-pv-claim-geomap-wms @@ -118,7 +118,7 @@ extraInitContainers: - /bin/mkdir - -p - --mode=777 - - /var/lib/grafana/plugins/geomap-wms-panel + - /var/lib/grafana/plugins/felixrelleum-geomapwms-panel volumeMounts: - name: storage mountPath: "/var/lib/grafana" \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index 5f2678b..6f636a1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,11 +1,11 @@ { - "name": "geomap-wms-panel", + "name": "felixrelleum-geomapwms-panel", "version": "1.0.0", "lockfileVersion": 3, "requires": true, "packages": { "": { - "name": "geomap-wms-panel", + "name": "felixrelleum-geomapwms-panel", "version": "1.0.0", "license": "Apache-2.0", "dependencies": { diff --git a/package.json b/package.json index 620a44b..2cd6739 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "geomap-wms-panel", + "name": "felixrelleum-geomapwms-panel", "version": "1.0.0", "description": "", "scripts": { @@ -13,7 +13,7 @@ "lint:fix": "npm run lint -- --fix", "server": "docker compose up --build", "sign": "npx --yes @grafana/sign-plugin@latest --distDir ./geomap-wms-panel", - "validate": "zip -qr geomap-wms-panel.zip geomap-wms-panel && npx --yes @grafana/plugin-validator@latest -sourceCodeUri file://. geomap-wms-panel.zip; rm -r geomap-wms-panel.zip", + "validate": "zip -qr felixrelleum-geomapwms-panel.zip felixrelleum-geomapwms-panel && npx --yes @grafana/plugin-validator@latest -sourceCodeUri file://. felixrelleum-geomapwms-panel.zip; rm -r felixrelleum-geomapwms-panel.zip", "start": "yarn watch", "test:all": "jest --coverage", "test": "jest --watch --onlyChanged", diff --git a/provisioning/dashboards/dashboard_e2e.json b/provisioning/dashboards/dashboard_e2e.json index 286decb..b5f6bd1 100644 --- a/provisioning/dashboards/dashboard_e2e.json +++ b/provisioning/dashboards/dashboard_e2e.json @@ -146,7 +146,7 @@ } } ], - "type": "felixrelleum-geomap-wms-panel" + "type": "felixrelleum-geomapwms-panel" }, { "datasource": { diff --git a/src/plugin.json b/src/plugin.json index 0fb89f6..d2f6058 100644 --- a/src/plugin.json +++ b/src/plugin.json @@ -1,7 +1,7 @@ { "type": "panel", "name": "Geomap Panel WMS", - "id": "felixrelleum-geomap-wms-panel", + "id": "felixrelleum-geomapwms-panel", "info": { "description": "Extension of the Geomap-Plugin by OGC Web Map Service integration", "author": {