From d00493490f62f084759310fbf6357d22e43b6634 Mon Sep 17 00:00:00 2001 From: Will Browne Date: Fri, 7 Mar 2025 17:00:25 +0000 Subject: [PATCH 1/2] make IDs match --- examples/datasource-http-backend/pkg/main.go | 2 +- examples/datasource-http-backend/src/plugin.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/datasource-http-backend/pkg/main.go b/examples/datasource-http-backend/pkg/main.go index 36d082519..7741ac641 100644 --- a/examples/datasource-http-backend/pkg/main.go +++ b/examples/datasource-http-backend/pkg/main.go @@ -17,7 +17,7 @@ func main() { // from Grafana to create different instances of SampleDatasource (per datasource // ID). When datasource configuration changed Dispose method will be called and // new datasource instance created using NewSampleDatasource factory. - if err := datasource.Manage("grafana-datasourcehttpbackend-datasource", plugin.NewDatasource, plugin.DatasourceOpts); err != nil { + if err := datasource.Manage("myorg-httpbackend-datasource", plugin.NewDatasource, plugin.DatasourceOpts); err != nil { log.DefaultLogger.Error(err.Error()) os.Exit(1) } diff --git a/examples/datasource-http-backend/src/plugin.json b/examples/datasource-http-backend/src/plugin.json index 8f8e45028..b70ced84a 100644 --- a/examples/datasource-http-backend/src/plugin.json +++ b/examples/datasource-http-backend/src/plugin.json @@ -2,7 +2,7 @@ "$schema": "https://raw.githubusercontent.com/grafana/grafana/main/docs/sources/developers/plugins/plugin.schema.json", "type": "datasource", "name": "Datasource Http Backend", - "id": "example-httpbackend-datasource", + "id": "myorg-httpbackend-datasource", "metrics": true, "backend": true, "alerting": true, From 0d291a951e3e382c97b9b3117123b2b47615b9af Mon Sep 17 00:00:00 2001 From: Will Browne Date: Fri, 7 Mar 2025 17:26:29 +0000 Subject: [PATCH 2/2] update missing refs --- .../.config/docker-compose-base.yaml | 10 +++++----- .../.config/supervisord/supervisord.conf | 8 ++++---- examples/datasource-http-backend/docker-compose.yaml | 6 +++--- .../pkg/kinds/query.panel.example.json | 4 ++-- .../datasource-http-backend/pkg/kinds/query_test.go | 2 +- .../provisioning/datasources/datasources.yml | 2 +- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/examples/datasource-http-backend/.config/docker-compose-base.yaml b/examples/datasource-http-backend/.config/docker-compose-base.yaml index f94304a0a..4c9ba318c 100644 --- a/examples/datasource-http-backend/.config/docker-compose-base.yaml +++ b/examples/datasource-http-backend/.config/docker-compose-base.yaml @@ -1,7 +1,7 @@ services: grafana: user: root - container_name: 'example-httpbackend-datasource' + container_name: 'myorg-httpbackend-datasource' build: context: . @@ -19,13 +19,13 @@ services: cap_add: - SYS_PTRACE volumes: - - ../dist:/var/lib/grafana/plugins/example-httpbackend-datasource + - ../dist:/var/lib/grafana/plugins/myorg-httpbackend-datasource - ../provisioning:/etc/grafana/provisioning - - ..:/root/example-httpbackend-datasource + - ..:/root/myorg-httpbackend-datasource environment: NODE_ENV: development - GF_LOG_FILTERS: plugin.example-httpbackend-datasource:debug + GF_LOG_FILTERS: plugin.myorg-httpbackend-datasource:debug GF_LOG_LEVEL: debug GF_DATAPROXY_LOGGING: 1 - GF_PLUGINS_ALLOW_LOADING_UNSIGNED_PLUGINS: example-httpbackend-datasource + GF_PLUGINS_ALLOW_LOADING_UNSIGNED_PLUGINS: myorg-httpbackend-datasource diff --git a/examples/datasource-http-backend/.config/supervisord/supervisord.conf b/examples/datasource-http-backend/.config/supervisord/supervisord.conf index 6f4ef1759..906260cbd 100644 --- a/examples/datasource-http-backend/.config/supervisord/supervisord.conf +++ b/examples/datasource-http-backend/.config/supervisord/supervisord.conf @@ -5,7 +5,7 @@ user=root [program:grafana] user=root directory=/var/lib/grafana -command=bash -c 'while [ ! -f /root/example-httpbackend-datasource/dist/gpx_datasource_http_backend* ]; do sleep 1; done; /run.sh' +command=bash -c 'while [ ! -f /root/myorg-httpbackend-datasource/dist/gpx_datasource_http_backend* ]; do sleep 1; done; /run.sh' stdout_logfile=/dev/fd/1 stdout_logfile_maxbytes=0 redirect_stderr=true @@ -26,7 +26,7 @@ autorestart=true [program:build-watcher] user=root -command=/bin/bash -c 'while inotifywait -e modify,create,delete -r /var/lib/grafana/plugins/example-httpbackend-datasource; do echo "Change detected, restarting delve...";supervisorctl restart delve; done' +command=/bin/bash -c 'while inotifywait -e modify,create,delete -r /var/lib/grafana/plugins/myorg-httpbackend-datasource; do echo "Change detected, restarting delve...";supervisorctl restart delve; done' stdout_logfile=/dev/fd/1 stdout_logfile_maxbytes=0 redirect_stderr=true @@ -37,8 +37,8 @@ autostart=true [program:mage-watcher] user=root environment=PATH="/usr/local/go/bin:/root/go/bin:%(ENV_PATH)s" -directory=/root/example-httpbackend-datasource -command=/bin/bash -c 'git config --global --add safe.directory /root/example-httpbackend-datasource && mage -v watch' +directory=/root/myorg-httpbackend-datasource +command=/bin/bash -c 'git config --global --add safe.directory /root/myorg-httpbackend-datasource && mage -v watch' stdout_logfile=/dev/fd/1 stdout_logfile_maxbytes=0 redirect_stderr=true diff --git a/examples/datasource-http-backend/docker-compose.yaml b/examples/datasource-http-backend/docker-compose.yaml index d2f1f87db..3ca3832cf 100644 --- a/examples/datasource-http-backend/docker-compose.yaml +++ b/examples/datasource-http-backend/docker-compose.yaml @@ -2,7 +2,7 @@ version: '3.0' services: grafana: - container_name: 'grafana-datasourcehttpbackend-datasource' + container_name: 'myorg-httpbackend-datasource' build: context: ./.config args: @@ -11,12 +11,12 @@ services: ports: - 3000:3000/tcp volumes: - - ./dist:/var/lib/grafana/plugins/grafana-datasourcehttpbackend-datasource + - ./dist:/var/lib/grafana/plugins/myorg-httpbackend-datasource - ./provisioning:/etc/grafana/provisioning extra_hosts: - 'host.docker.internal:host-gateway' mockserver: - container_name: 'mockserver-datasourcehttpbackend-datasource' + container_name: 'mockserver-httpbackend-datasource' build: context: ./server ports: diff --git a/examples/datasource-http-backend/pkg/kinds/query.panel.example.json b/examples/datasource-http-backend/pkg/kinds/query.panel.example.json index 6888ca3e6..64c708409 100644 --- a/examples/datasource-http-backend/pkg/kinds/query.panel.example.json +++ b/examples/datasource-http-backend/pkg/kinds/query.panel.example.json @@ -4,10 +4,10 @@ { "refId": "A", "datasource": { - "type": "example-httpbackend-datasource", + "type": "myorg-httpbackend-datasource", "uid": "TheUID" }, "multiplier": 1 } ] -} \ No newline at end of file +} diff --git a/examples/datasource-http-backend/pkg/kinds/query_test.go b/examples/datasource-http-backend/pkg/kinds/query_test.go index dce719486..f95caeb9c 100644 --- a/examples/datasource-http-backend/pkg/kinds/query_test.go +++ b/examples/datasource-http-backend/pkg/kinds/query_test.go @@ -12,7 +12,7 @@ import ( func TestQueryTypeDefinitions(t *testing.T) { builder, err := schemabuilder.NewSchemaBuilder( schemabuilder.BuilderOptions{ - PluginID: []string{"example-httpbackend-datasource"}, + PluginID: []string{"myorg-httpbackend-datasource"}, ScanCode: []schemabuilder.CodePaths{{ BasePackage: "github.com/grafana/datasource-http-backend/pkg/kinds", CodePath: "./", diff --git a/examples/datasource-http-backend/provisioning/datasources/datasources.yml b/examples/datasource-http-backend/provisioning/datasources/datasources.yml index abcbeddd4..cbe57add4 100644 --- a/examples/datasource-http-backend/provisioning/datasources/datasources.yml +++ b/examples/datasource-http-backend/provisioning/datasources/datasources.yml @@ -2,7 +2,7 @@ apiVersion: 1 datasources: - name: Http Backend Data Source - type: example-httpbackend-datasource + type: myorg-httpbackend-datasource isDefault: true orgId: 1 version: 1