Fix build issue after renaming the plugin (#45)

* update plugin name

* npx create-plugin update

* update versions

* update uid

* update 2

Author: itsmylife

.config/.cprc.json

@@ -1,3 +1,3 @@
 {
-  "version": "4.3.0"
+  "version": "4.4.4"
 }

.config/supervisord/supervisord.conf

@@ -5,7 +5,7 @@ user=root
 [program:grafana]
 user=root
 directory=/var/lib/grafana
-command=/run.sh
+command=bash -c 'while [ ! -f /root/grafana-prometheusamazon-datasource/dist/gpx_prometheus_amazon* ]; 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/prometheus-amazon-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/grafana-prometheusamazon-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/prometheus-amazon-datasource
-command=/bin/bash -c 'git config --global --add safe.directory /root/prometheus-amazon-datasource && mage -v watch'
+directory=/root/grafana-prometheusamazon-datasource
+command=/bin/bash -c 'git config --global --add safe.directory /root/grafana-prometheusamazon-datasource && mage -v watch'
 stdout_logfile=/dev/fd/1
 stdout_logfile_maxbytes=0
 redirect_stderr=true

.github/workflows/e2e.yml

@@ -51,7 +51,7 @@ jobs:
           install-only: true
 
       - name: Build binaries
-        run: mage -v build:linux
+        run: mage -v
 
       - name: Build frontend
         run: yarn build

README.md

@@ -63,14 +63,14 @@ Read more about it here:
 5. Spin up a Grafana instance and run the plugin inside it (using Docker)
 
    ```bash
-   yarn run server
+   yarn run server:configured
    ```
 
 6. Run the E2E tests (using Playwright and @grafana/plugin-e2e)
 
    ```bash
-   # Spins up a Grafana docker instance (port 3000) with an actual Prometheus instance (port 9090)
-   yarn run server
+   # Spins up a Grafana docker instance (v10.4.1) (port 3000) with an actual Prometheus instance (port 9090)
+   yarn run server:configured
 
    # Starts the e2e tests
    yarn run e2e

docker-compose.yaml

@@ -13,7 +13,7 @@ services:
 
   grafana:
     user: root
-    container_name: 'prometheus-amazon-datasource'
+    container_name: 'grafana-prometheusamazon-datasource'
 
     depends_on:
       prometheus:
@@ -35,6 +35,6 @@ services:
     cap_add:
       - SYS_PTRACE
     volumes:
-      - ./dist:/var/lib/grafana/plugins/prometheus-amazon-datasource
+      - ./dist:/var/lib/grafana/plugins/grafana-prometheusamazon-datasource
       - ./provisioning:/etc/grafana/provisioning
-      - .:/root/prometheus-amazon-datasource
+      - .:/root/grafana-prometheusamazon-datasource

e2e/configuration.spec.ts

@@ -110,7 +110,7 @@ test.describe('Configuration tests', () => {
     const ds = await readProvisionedDataSource<DataSourcePluginOptionsEditorProps<PromOptions>>({ fileName: 'datasources.yml' });
 
     const configPage = await createDataSourceConfigPage({
-      type: "prometheus-amazon-datasource", 
+      type: "grafana-prometheusamazon-datasource",
       name: DATA_SOURCE_NAME,
     });
 
@@ -141,7 +141,7 @@ test.describe('Configuration tests', () => {
     // const ds = await readProvisionedDataSource<DataSourcePluginOptionsEditorProps<PromOptions>>({ fileName: 'datasources.yml' });
 
     const configPage = await createDataSourceConfigPage({
-      type: "prometheus-amazon-datasource", 
+      type: "grafana-prometheusamazon-datasource",
       name: DATA_SOURCE_NAME + "check",
     });
 

package.json

@@ -1,5 +1,5 @@
 {
-  "name": "prometheus-amazon",
+  "name": "grafana-prometheusamazon-datasource",
   "version": "0.1.0",
   "description": "A prometheus plugin for Amazon",
   "scripts": {
@@ -11,7 +11,7 @@
     "typecheck": "tsc --noEmit",
     "lint": "eslint --cache --ignore-path ./.gitignore --ext .js,.jsx,.ts,.tsx .",
     "lint:fix": "yarn run lint --fix",
-    "server": "docker-compose up --build",
+    "server:configured": "GRAFANA_VERSION=10.4.1 GRAFANA_IMAGE=grafana-enterprise docker-compose up -d",
     "sign": "npx --yes @grafana/sign-plugin@latest --rootUrls https://github.com/grafana/prometheus-amazon"
   },
   "author": "Grafana Labs",
@@ -20,11 +20,11 @@
     "@emotion/eslint-plugin": "11.11.0",
     "@grafana/e2e": "11.0.0-162805",
     "@grafana/e2e-selectors": "11.0.0-162805",
-    "@grafana/eslint-config": "6.0.1",
+    "@grafana/eslint-config": "7.0.0",
     "@grafana/plugin-e2e": "0.19.0",
     "@grafana/tsconfig": "1.3.0-rc1",
     "@playwright/test": "^1.41.2",
-    "@swc/core": "1.3.75",
+    "@swc/core": "1.3.90",
     "@swc/helpers": "0.5.6",
     "@swc/jest": "0.2.26",
     "@testing-library/dom": "9.3.4",

pkg/main.go

@@ -16,7 +16,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("prometheus-amazon-datasource", NewDatasource, datasource.ManageOpts{}); err != nil {
+	if err := datasource.Manage("grafana-prometheusamazon-datasource", NewDatasource, datasource.ManageOpts{}); err != nil {
 		log.DefaultLogger.Error(err.Error())
 		os.Exit(1)
 	}

provisioning/dashboards/e2e-dashboard.json

@@ -15,8 +15,8 @@
       },
       {
         "datasource": {
-          "type": "prometheus-amazon-datasource",
-          "uid": "prometheus-amazon"
+          "type": "grafana-prometheusamazon-datasource",
+          "uid": "grafana-prometheusamazon"
         },
         "enable": true,
         "expr": "go_goroutines",
@@ -38,8 +38,8 @@
   "panels": [
     {
       "datasource": {
-        "type": "prometheus-amazon-datasource",
-        "uid": "prometheus-amazon"
+        "type": "grafana-prometheusamazon-datasource",
+        "uid": "grafana-prometheusamazon"
       },
       "fieldConfig": {
         "defaults": {
@@ -119,7 +119,7 @@
         {
           "datasource": {
             "type": "prometheus",
-            "uid": "prometheus-amazon"
+            "uid": "grafana-prometheusamazon"
           },
           "disableTextWrap": false,
           "editorMode": "builder",
@@ -149,8 +149,8 @@
           "value": "__name__"
         },
         "datasource": {
-          "type": "prometheus-amazon-datasource",
-          "uid": "prometheus-amazon"
+          "type": "grafana-prometheusamazon-datasource",
+          "uid": "grafana-prometheusamazon"
         },
         "definition": "label_names()",
         "hide": 0,
@@ -178,7 +178,7 @@
   "timeRangeUpdatedDuringEditOrView": false,
   "timepicker": {},
   "timezone": "browser",
-  "title": "prometheus-amazon",
+  "title": "grafana-prometheusamazon",
   "uid": "fdewz0hu7qccge",
   "version": 2,
   "weekStart": ""

provisioning/datasources/code-editor.yml

@@ -3,7 +3,7 @@ apiVersion: 1
 datasources:
 - name: a-prometheus-code-editor
   uid: a-prometheus-code-editor
-  type: prometheus-amazon-datasource
+  type: grafana-prometheusamazon-datasource
   url: http://prometheus:9090 
   access: proxy
   editable: true
@@ -16,4 +16,3 @@ datasources:
     # disableRecordingRules: false
     # incrementalQueryOverlapWindow: 10m
     defaultEditor: code
-