Rename to Amazon Managed Service for Prometheus Data Source (#179)

grafana · Jul 16, 2024 · e02ba84 · e02ba84
1 parent 9ca57e6
commit e02ba84
Show file tree

Hide file tree

Showing 17 changed files with 47 additions and 42 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Changelog
 
+## 0.3.0
+- Rename plugin & repo
+
 ## 0.2.0 (Private release for testing)
 - Initial private release of the Amazon Managed Prometheus plugin, a wrapper around [the core Prometheus datasource](https://grafana.com/docs/grafana/latest/datasources/prometheus/) that uses Amazon-specific authentication.
 

diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
-# Prometheus Amazon Data Source
+# Amazon Managed Service for Prometheus Data Source
 
-This data source plugin is is for Amazon Prometheus. It has all the features of the Grafana core Prometheus plugin with Amazon specific authentication in the configuration page.
+This data source plugin is for the Amazon Managed Service for Prometheus. It has all the features of the Grafana core Prometheus plugin with Amazon specific authentication in the configuration page.
 
 Amazon Managed Service for Prometheus is a Prometheus-compatible service that monitors and provides alerts on containerized applications and infrastructure at scale.
 

diff --git a/cspell.config.json b/cspell.config.json
@@ -32,7 +32,7 @@
     "grafana",
     "datasource",
     "datasources",
-    "prometheusamazon",
+    "amazonprometheus",
     "tsdb",
     "promlib",
     "instancemgmt",

diff --git a/docker-compose.yaml b/docker-compose.yaml
@@ -13,7 +13,7 @@ services:
 
   grafana:
     user: root
-    container_name: 'grafana-prometheusamazon-datasource'
+    container_name: 'grafana-amazonprometheus-datasource'
     platform: linux/amd64
 
     depends_on:
@@ -36,6 +36,6 @@ services:
     cap_add:
       - SYS_PTRACE
     volumes:
-      - ./dist:/var/lib/grafana/plugins/grafana-prometheusamazon-datasource
+      - ./dist:/var/lib/grafana/plugins/grafana-amazonprometheus-datasource
       - ./provisioning:/etc/grafana/provisioning
-      - .:/root/grafana-prometheusamazon-datasource
+      - .:/root/grafana-amazonprometheus-datasource
diff --git a/e2e/annotation-editor.spec.ts b/e2e/annotation-editor.spec.ts
@@ -15,7 +15,7 @@ test.describe('Prometheus annotation query editor', () => {
 
     await page.getByTestId('data-testid Select a data source').fill(ds.name);
 
-    await page.getByRole('button', { name: `${ds.name} Prometheus` }).click();
+    await page.getByRole('button', { name: `${ds.name}` }).click();
 
     await expect(annotationEditPage
       .getByGrafanaSelector(selectors.components.DataSource.Prometheus.queryEditor.code.queryField)).toBeVisible();

diff --git a/e2e/configuration.spec.ts b/e2e/configuration.spec.ts
@@ -108,7 +108,7 @@ test.describe('Configuration tests', () => {
     page,
   }) => {
     const configPage = await createDataSourceConfigPage({
-      type: "grafana-prometheusamazon-datasource",
+      type: "grafana-amazonprometheus-datasource",
       name: DATA_SOURCE_NAME,
     });
 
@@ -136,7 +136,7 @@ test.describe('Configuration tests', () => {
     page,
   }) => {
     const configPage = await createDataSourceConfigPage({
-      type: "grafana-prometheusamazon-datasource",
+      type: "grafana-amazonprometheus-datasource",
       name: DATA_SOURCE_NAME + "check",
     });
 

diff --git a/e2e/query-editor.spec.ts b/e2e/query-editor.spec.ts
@@ -196,9 +196,9 @@ test.describe('Prometheus query editor', () => {
 
       await page.getByTestId('data-testid Select a data source').click();
 
-      await page.getByTestId('data-testid Select a data source').fill('Prometheus-amazon');
+      await page.getByTestId('data-testid Select a data source').fill('Amazon Managed Service for Prometheus');
 
-      await page.getByRole('button', { name: 'Prometheus-amazon Prometheus' }).click();
+      await page.getByRole('button', { name: 'Amazon Managed Service for Prometheus' }).click();
 
       await explorePage
         .getByGrafanaSelector(selectors.components.DataSource.Prometheus.queryEditor.builder.metricSelect).isVisible();
@@ -226,9 +226,9 @@ test.describe('Prometheus query editor', () => {
 
       await page.getByTestId('data-testid Select a data source').click();
 
-      await page.getByTestId('data-testid Select a data source').fill('Prometheus-amazon');
+      await page.getByTestId('data-testid Select a data source').fill('Amazon Managed Service for Prometheus');
 
-      await page.getByRole('button', { name: 'Prometheus-amazon Prometheus' }).click();
+      await page.getByRole('button', { name: 'Amazon Managed Service for Prometheus' }).click();
 
       await explorePage
         .getByGrafanaSelector(selectors.components.DataSource.Prometheus.queryEditor.builder.metricSelect).isEnabled();
@@ -271,9 +271,9 @@ test.describe('Prometheus query editor', () => {
 
       await page.getByTestId('data-testid Select a data source').click();
 
-      await page.getByTestId('data-testid Select a data source').fill('Prometheus-amazon');
+      await page.getByTestId('data-testid Select a data source').fill('Amazon Managed Service for Prometheus');
 
-      await page.getByRole('button', { name: 'Prometheus-amazon Prometheus' }).click();
+      await page.getByRole('button', { name: 'Amazon Managed Service for Prometheus' }).click();
 
       await explorePage
         .getByGrafanaSelector(selectors.components.DataSource.Prometheus.queryEditor.builder.metricSelect).isVisible();
@@ -306,9 +306,9 @@ test.describe('Prometheus query editor', () => {
 
       await page.getByTestId('data-testid Select a data source').click();
 
-      await page.getByTestId('data-testid Select a data source').fill('Prometheus-amazon');
+      await page.getByTestId('data-testid Select a data source').fill('Amazon Managed Service for Prometheus');
 
-      await page.getByRole('button', { name: 'Prometheus-amazon Prometheus' }).click();
+      await page.getByRole('button', { name: 'Amazon Managed Service for Prometheus' }).click();
 
       await explorePage
         .getByGrafanaSelector(selectors.components.QueryBuilder.labelSelect).isVisible();
@@ -343,9 +343,9 @@ test.describe('Prometheus query editor', () => {
 
       await page.getByTestId('data-testid Select a data source').click();
 
-      await page.getByTestId('data-testid Select a data source').fill('Prometheus-amazon');
+      await page.getByTestId('data-testid Select a data source').fill('Amazon Managed Service for Prometheus');
 
-      await page.getByRole('button', { name: 'Prometheus-amazon Prometheus' }).click();
+      await page.getByRole('button', { name: 'Amazon Managed Service for Prometheus' }).click();
 
       await explorePage
         .getByGrafanaSelector(selectors.components.DataSource.Prometheus.queryEditor.builder.metricSelect).isVisible();

diff --git a/go.mod b/go.mod
@@ -1,4 +1,4 @@
-module github.com/grafana/prometheus-amazon
+module github.com/grafana/grafana-amazonprometheus-datasource
 
 go 1.22.4
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
-  "name": "grafana-prometheusamazon-datasource",
-  "version": "0.2.0",
+  "name": "grafana-amazonprometheus-datasource",
+  "version": "0.3.0",
   "description": "A plugin for Amazon Managed Prometheus",
   "scripts": {
     "build": "webpack -c ./.config/webpack/webpack.config.ts --env production",

diff --git a/pkg/datasource.go b/pkg/datasource.go
@@ -13,7 +13,7 @@ import (
 )
 
 func NewDatasource(ctx context.Context, dsInstanceSettings backend.DataSourceInstanceSettings) (instancemgmt.Instance, error) {
-	plog := backend.NewLoggerWith("logger", "tsdb.prometheus-amazon")
+	plog := backend.NewLoggerWith("logger", "tsdb.amazon-prometheus")
 	plog.Debug("Initializing")
 
 	authSettings, _ := awsds.ReadAuthSettingsFromContext(ctx)

diff --git a/pkg/main.go b/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("grafana-prometheusamazon-datasource", NewDatasource, datasource.ManageOpts{}); err != nil {
+	if err := datasource.Manage("grafana-amazonprometheus-datasource", NewDatasource, datasource.ManageOpts{}); err != nil {
 		log.DefaultLogger.Error(err.Error())
 		os.Exit(1)
 	}

diff --git a/provisioning/dashboards/e2e-dashboard.json b/provisioning/dashboards/e2e-dashboard.json
@@ -15,8 +15,8 @@
       },
       {
         "datasource": {
-          "type": "grafana-prometheusamazon-datasource",
-          "uid": "grafana-prometheusamazon"
+          "type": "grafana-amazonprometheus-datasource",
+          "uid": "grafana-amazonprometheus"
         },
         "enable": true,
         "expr": "go_goroutines",
@@ -38,8 +38,8 @@
   "panels": [
     {
       "datasource": {
-        "type": "grafana-prometheusamazon-datasource",
-        "uid": "grafana-prometheusamazon"
+        "type": "grafana-amazonprometheus-datasource",
+        "uid": "grafana-amazonprometheus"
       },
       "fieldConfig": {
         "defaults": {
@@ -119,7 +119,7 @@
         {
           "datasource": {
             "type": "prometheus",
-            "uid": "grafana-prometheusamazon"
+            "uid": "grafana-amazonprometheus"
           },
           "disableTextWrap": false,
           "editorMode": "builder",
@@ -149,8 +149,8 @@
           "value": "__name__"
         },
         "datasource": {
-          "type": "grafana-prometheusamazon-datasource",
-          "uid": "grafana-prometheusamazon"
+          "type": "grafana-amazonprometheus-datasource",
+          "uid": "grafana-amazonprometheus"
         },
         "definition": "label_names()",
         "hide": 0,
@@ -178,7 +178,7 @@
   "timeRangeUpdatedDuringEditOrView": false,
   "timepicker": {},
   "timezone": "browser",
-  "title": "grafana-prometheusamazon",
+  "title": "grafana-amazonprometheus",
   "uid": "fdewz0hu7qccge",
   "version": 2,
   "weekStart": ""

diff --git a/provisioning/datasources/code-editor.yml b/provisioning/datasources/code-editor.yml
@@ -3,7 +3,7 @@ apiVersion: 1
 datasources:
 - name: a-prometheus-code-editor
   uid: a-prometheus-code-editor
-  type: grafana-prometheusamazon-datasource
+  type: grafana-amazonprometheus-datasource
   url: http://prometheus:9090 
   access: proxy
   editable: true

diff --git a/provisioning/datasources/datasources.yml b/provisioning/datasources/datasources.yml
@@ -1,9 +1,9 @@
 apiVersion: 1
 
 datasources:
-- name: Prometheus-amazon
-  uid: grafana-prometheusamazon
-  type: grafana-prometheusamazon-datasource
+- name: Amazon Managed Service for Prometheus
+  uid: grafana-amazonprometheus
+  type: grafana-amazonprometheus-datasource
   url: http://prometheus:9090 
   access: proxy
   editable: true

diff --git a/src/README.md b/src/README.md
@@ -1,4 +1,4 @@
-# Prometheus Amazon Data Source
+# Amazon Managed Service for Prometheus Data Source
 
 Amazon Managed Service for Prometheus is a Prometheus-compatible service that monitors and provides alerts on containerized applications and infrastructure at scale.
 

diff --git a/src/configuration/ConfigEditor.tsx b/src/configuration/ConfigEditor.tsx
@@ -22,11 +22,12 @@ export const ConfigEditor = (props: Props) => {
     <>
       {options.access === 'direct' && (
         <Alert title="Error" severity="error">
-          Browser access mode in the Prometheus data source is no longer available. Switch to server access mode.
+          Browser access mode in the Amazon Managed Service for Prometheus data source is no longer available. Switch to server access mode.
         </Alert>
       )}
       <DataSourceDescription
-        dataSourceName="Prometheus"
+        dataSourceName="Amazon Managed Service for Prometheus"
+        // TODO: point this at the new plugin's docs or README  }
         docsLink="https://grafana.com/docs/grafana/latest/datasources/prometheus/configure-prometheus-data-source/"
       />
       <hr className={`${styles.hrTopSpace} ${styles.hrBottomSpace}`} />
@@ -60,6 +61,7 @@ export const ConfigEditor = (props: Props) => {
  * @returns
  */
 export function docsTip(url?: string) {
+  /* TODO: point this at the new plugin's docs or README */
   const docsUrl = 'https://grafana.com/docs/grafana/latest/datasources/prometheus/#configure-the-data-source';
 
   return (

diff --git a/src/plugin.json b/src/plugin.json
@@ -2,9 +2,9 @@
   "category": "tsdb",
   "$schema": "https://raw.githubusercontent.com/grafana/grafana/main/docs/sources/developers/plugins/plugin.schema.json",
   "type": "datasource",
-  "name": "Prometheus Amazon",
-  "id": "grafana-prometheusamazon-datasource",
-  "executable": "gpx_prometheus_amazon",
+  "name": "Amazon Managed Service for Prometheus",
+  "id": "grafana-amazonprometheus-datasource",
+  "executable": "gpx_amazonprometheus",
   "routes": [
     {
       "method": "POST",