Skip to content

Commit

Permalink
chore: change plugin name
Browse files Browse the repository at this point in the history
  • Loading branch information
felix-mu committed May 3, 2024
1 parent 1c96c86 commit a5af426
Show file tree
Hide file tree
Showing 12 changed files with 28 additions and 28 deletions.
2 changes: 1 addition & 1 deletion .config/webpack/constants.ts
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
export const SOURCE_DIR = 'src';
export const DIST_DIR = 'geomap-wms-panel';
export const DIST_DIR = 'felixrelleum-geomapwms-panel';
10 changes: 5 additions & 5 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/validate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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


2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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=<comma separated list of plugin-ids>` 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=<comma separated list of plugin-ids>` 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:**
Expand Down
4 changes: 2 additions & 2 deletions docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
8 changes: 4 additions & 4 deletions kubernetes/helm/grafana-geomap-wms/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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

Expand All @@ -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"
Expand Down
8 changes: 4 additions & 4 deletions kubernetes/values-grafana.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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

Expand All @@ -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"
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "geomap-wms-panel",
"name": "felixrelleum-geomapwms-panel",
"version": "1.0.0",
"description": "",
"scripts": {
Expand All @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion provisioning/dashboards/dashboard_e2e.json
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@
}
}
],
"type": "felixrelleum-geomap-wms-panel"
"type": "felixrelleum-geomapwms-panel"
},
{
"datasource": {
Expand Down
2 changes: 1 addition & 1 deletion src/plugin.json
Original file line number Diff line number Diff line change
@@ -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": {
Expand Down

0 comments on commit a5af426

Please sign in to comment.