Stackdriver: Rename Stackdriver to Google Cloud Monitoring

.github/CODEOWNERS

@@ -56,5 +56,5 @@ lerna.json @grafana/grafana-frontend-platform
 /public/app/plugins/datasource/opentsdb @grafana/backend-platform
 /public/app/plugins/datasource/postgres @grafana/backend-platform
 /public/app/plugins/datasource/prometheus @grafana/observability-squad
-/public/app/plugins/datasource/stackdriver @grafana/backend-platform
+/public/app/plugins/datasource/cloud-monitoring @grafana/backend-platform
 /public/app/plugins/datasource/zipkin @grafana/observability-squad

docs/sources/_index.md

@@ -91,9 +91,9 @@ aliases = ["/docs/grafana/v1.1", "/docs/grafana/latest/guides/reference/admin",
       <img src="/img/docs/logos/icon_prometheus.svg" >
       <h5>Prometheus</h5>
     </a>
-    <a href="{{< relref "features/datasources/stackdriver.md" >}}" class="nav-cards__item nav-cards__item--ds">
-      <img src="/img/docs/logos/icon_stackdriver.svg">
-      <h5>Google Stackdriver</h5>
+    <a href="{{< relref "features/datasources/cloudmonitoring.md" >}}" class="nav-cards__item nav-cards__item--ds">
+      <img src="/img/docs/logos/icon_cloudmonitoring.svg">
+      <h5>Google Cloud Monitoring</h5>
     </a>
     <a href="{{< relref "features/datasources/cloudwatch.md" >}}" class="nav-cards__item nav-cards__item--ds">
       <img src="/img/docs/logos/icon_cloudwatch.svg">

docs/sources/alerting/_index.md

@@ -41,7 +41,7 @@ The actual notifications are configured and shared between multiple alerts.
 
 Alert rules are evaluated in the Grafana backend in a scheduler and query execution engine that is part
 of core Grafana. Only some data sources are supported right now. They include `Graphite`, `Prometheus`, `InfluxDB`, `Elasticsearch`,
-`Stackdriver`, `Cloudwatch`, `Azure Monitor`, `MySQL`, `PostgreSQL`, `MSSQL`, `OpenTSDB`, `Oracle`, and `Azure Data Explorer`.
+`Google Cloud Monitoring`, `Cloudwatch`, `Azure Monitor`, `MySQL`, `PostgreSQL`, `MSSQL`, `OpenTSDB`, `Oracle`, and `Azure Data Explorer`.
 
 ## Metrics from the alert engine
 

docs/sources/alerting/alerts-overview.md

@@ -42,7 +42,7 @@ The actual notifications are configured and shared between multiple alerts.
 
 Alert rules are evaluated in the Grafana backend in a scheduler and query execution engine that is part
 of core Grafana. Only some data sources are supported right now. They include `Graphite`, `Prometheus`, `InfluxDB`, `Elasticsearch`,
-`Stackdriver`, `Cloudwatch`, `Azure Monitor`, `MySQL`, `PostgreSQL`, `MSSQL`, `OpenTSDB`, `Oracle`, and `Azure Data Explorer`.
+`Google Cloud Monitoring`, `Cloudwatch`, `Azure Monitor`, `MySQL`, `PostgreSQL`, `MSSQL`, `OpenTSDB`, `Oracle`, and `Azure Data Explorer`.
 
 ## Metrics from the alert engine
 

docs/sources/features/datasources/_index.md

@@ -24,7 +24,7 @@ The following data sources are officially supported:
 * [AWS CloudWatch]({{< relref "cloudwatch.md" >}})
 * [Azure Monitor]({{< relref "azuremonitor.md" >}})
 * [Elasticsearch]({{< relref "elasticsearch.md" >}})
-* [Google Stackdriver]({{< relref "stackdriver.md" >}})
+* [Google Cloud Monitoring]({{< relref "cloudmonitoring.md" >}})
 * [Graphite]({{< relref "graphite.md" >}})
 * [InfluxDB]({{< relref "influxdb.md" >}})
 * [Loki]({{< relref "loki.md" >}})

docs/sources/guides/whats-new-in-v7-0.md

@@ -181,7 +181,7 @@ It was released as a beta feature in Grafana 6.7. The feedback has been really p
 
 ## Stackdriver data source supports Service Monitoring
 
-[Service monitoring](https://cloud.google.com/service-monitoring) in Google Cloud Platform (GCP) enables you to monitor based on Service Level Objectives (SLOs) for your GCP services. The new SLO query builder in the Stackdriver data source allows you to display SLO data in Grafana. Read more about it in the [Stackdriver data source documentation]({{< relref "../features/datasources/stackdriver/#slo-service-level-objective-queries" >}}).
+[Service monitoring](https://cloud.google.com/service-monitoring) in Google Cloud Platform (GCP) enables you to monitor based on Service Level Objectives (SLOs) for your GCP services. The new SLO query builder in the Stackdriver data source allows you to display SLO data in Grafana. Read more about it in the [Stackdriver data source documentation]({{< relref "../features/datasources/cloudmonitoring/#slo-service-level-objective-queries" >}}).
 
 ## Time zone support
 

docs/sources/menu.yaml

@@ -109,8 +109,8 @@
       name: Azure Monitor
     - link: /features/datasources/elasticsearch/
       name: Elasticsearch
-    - link: /features/datasources/stackdriver/
-      name: Google Stackdriver
+    - link: /features/datasources/cloudmonitoring/
+      name: Google Cloud Monitoring
     - link: /features/datasources/graphite/
       name: Graphite
     - link: /features/datasources/influxdb/

packages/grafana-data/src/types/data.ts

@@ -43,7 +43,7 @@ export interface QueryResultMeta {
    * Legacy data source specific, should be moved to custom
    * */
   gmdMeta?: any[]; // used by cloudwatch
-  alignmentPeriod?: string; // used by stackdriver
+  alignmentPeriod?: string; // used by cloud monitoring
   searchWords?: string[]; // used by log models and loki
   limit?: number; // used by log models and loki
   json?: boolean; // used to keep track of old json doc values

pkg/cmd/grafana-server/main.go

@@ -20,6 +20,7 @@ import (
 	_ "github.com/grafana/grafana/pkg/services/alerting/notifiers"
 	"github.com/grafana/grafana/pkg/setting"
 	_ "github.com/grafana/grafana/pkg/tsdb/azuremonitor"
+	_ "github.com/grafana/grafana/pkg/tsdb/cloudmonitoring"
 	_ "github.com/grafana/grafana/pkg/tsdb/cloudwatch"
 	_ "github.com/grafana/grafana/pkg/tsdb/elasticsearch"
 	_ "github.com/grafana/grafana/pkg/tsdb/graphite"
@@ -28,7 +29,6 @@ import (
 	_ "github.com/grafana/grafana/pkg/tsdb/opentsdb"
 	_ "github.com/grafana/grafana/pkg/tsdb/postgres"
 	_ "github.com/grafana/grafana/pkg/tsdb/prometheus"
-	_ "github.com/grafana/grafana/pkg/tsdb/stackdriver"
 	_ "github.com/grafana/grafana/pkg/tsdb/testdatasource"
 )
 

pkg/models/datasource.go

@@ -9,22 +9,22 @@ import (
 )
 
 const (
-	DS_GRAPHITE      = "graphite"
-	DS_INFLUXDB      = "influxdb"
-	DS_INFLUXDB_08   = "influxdb_08"
-	DS_ES            = "elasticsearch"
-	DS_OPENTSDB      = "opentsdb"
-	DS_CLOUDWATCH    = "cloudwatch"
-	DS_KAIROSDB      = "kairosdb"
-	DS_PROMETHEUS    = "prometheus"
-	DS_POSTGRES      = "postgres"
-	DS_MYSQL         = "mysql"
-	DS_MSSQL         = "mssql"
-	DS_ACCESS_DIRECT = "direct"
-	DS_ACCESS_PROXY  = "proxy"
-	DS_STACKDRIVER   = "stackdriver"
-	DS_AZURE_MONITOR = "grafana-azure-monitor-datasource"
-	DS_LOKI          = "loki"
+	DS_GRAPHITE         = "graphite"
+	DS_INFLUXDB         = "influxdb"
+	DS_INFLUXDB_08      = "influxdb_08"
+	DS_ES               = "elasticsearch"
+	DS_OPENTSDB         = "opentsdb"
+	DS_CLOUDWATCH       = "cloudwatch"
+	DS_KAIROSDB         = "kairosdb"
+	DS_PROMETHEUS       = "prometheus"
+	DS_POSTGRES         = "postgres"
+	DS_MYSQL            = "mysql"
+	DS_MSSQL            = "mssql"
+	DS_ACCESS_DIRECT    = "direct"
+	DS_ACCESS_PROXY     = "proxy"
+	DS_CLOUD_MONITORING = "stackdriver"
+	DS_AZURE_MONITOR    = "grafana-azure-monitor-datasource"
+	DS_LOKI             = "loki"
 )
 
 var (
@@ -97,7 +97,7 @@ var knownDatasourcePlugins = map[string]bool{
 	DS_POSTGRES:                              true,
 	DS_MYSQL:                                 true,
 	DS_MSSQL:                                 true,
-	DS_STACKDRIVER:                           true,
+	DS_CLOUD_MONITORING:                      true,
 	DS_AZURE_MONITOR:                         true,
 	DS_LOKI:                                  true,
 	"opennms":                                true,

pkg/plugins/frontend_plugin.go

@@ -60,8 +60,12 @@ func (fp *FrontendPluginBase) handleModuleDefaults() {
 	}
 
 	fp.IsCorePlugin = true
-	fp.Module = path.Join("app/plugins", fp.Type, fp.Id, "module")
-	fp.BaseUrl = path.Join("public/app/plugins", fp.Type, fp.Id)
+	// Previously there was an assumption that the plugin directory
+	// should be public/app/plugins/<plugin type>/<plugin id>
+	// However this can be an issue if the plugin directory should be renamed to something else
+	currentDir := path.Base(fp.PluginDir)
+	fp.Module = path.Join("app/plugins", fp.Type, currentDir, "module")
+	fp.BaseUrl = path.Join("public/app/plugins", fp.Type, currentDir)
 }
 
 func isExternalPlugin(pluginDir string) bool {

pkg/tsdb/stackdriver/annotation_query.go → pkg/tsdb/cloudmonitoring/annotation_query.go

@@ -1,4 +1,4 @@
-package stackdriver
+package cloudmonitoring
 
 import (
 	"context"
@@ -9,7 +9,7 @@ import (
 	"github.com/grafana/grafana/pkg/tsdb"
 )
 
-func (e *StackdriverExecutor) executeAnnotationQuery(ctx context.Context, tsdbQuery *tsdb.TsdbQuery) (*tsdb.Response, error) {
+func (e *CloudMonitoringExecutor) executeAnnotationQuery(ctx context.Context, tsdbQuery *tsdb.TsdbQuery) (*tsdb.Response, error) {
 	result := &tsdb.Response{
 		Results: make(map[string]*tsdb.QueryResult),
 	}
@@ -34,7 +34,7 @@ func (e *StackdriverExecutor) executeAnnotationQuery(ctx context.Context, tsdbQu
 	return result, err
 }
 
-func (e *StackdriverExecutor) parseToAnnotations(queryRes *tsdb.QueryResult, data stackdriverResponse, query *stackdriverQuery, title string, text string, tags string) error {
+func (e *CloudMonitoringExecutor) parseToAnnotations(queryRes *tsdb.QueryResult, data cloudMonitoringResponse, query *cloudMonitoringQuery, title string, text string, tags string) error {
 	annotations := make([]map[string]string, 0)
 
 	for _, series := range data.TimeSeries {

pkg/tsdb/stackdriver/annotation_query_test.go → pkg/tsdb/cloudmonitoring/annotation_query_test.go

@@ -1,4 +1,4 @@
-package stackdriver
+package cloudmonitoring
 
 import (
 	"testing"
@@ -9,16 +9,16 @@ import (
 	. "github.com/smartystreets/goconvey/convey"
 )
 
-func TestStackdriverAnnotationQuery(t *testing.T) {
-	Convey("Stackdriver Annotation Query Executor", t, func() {
-		executor := &StackdriverExecutor{}
-		Convey("When parsing the stackdriver api response", func() {
+func TestCloudMonitoringAnnotationQuery(t *testing.T) {
+	Convey("CloudMonitoring Annotation Query Executor", t, func() {
+		executor := &CloudMonitoringExecutor{}
+		Convey("When parsing the cloud monitoring api response", func() {
 			data, err := loadTestFile("./test-data/2-series-response-no-agg.json")
 			So(err, ShouldBeNil)
 			So(len(data.TimeSeries), ShouldEqual, 3)
 
 			res := &tsdb.QueryResult{Meta: simplejson.New(), RefId: "annotationQuery"}
-			query := &stackdriverQuery{}
+			query := &cloudMonitoringQuery{}
 			err = executor.parseToAnnotations(res, data, query, "atitle {{metric.label.instance_name}} {{metric.value}}", "atext {{resource.label.zone}}", "atag")
 			So(err, ShouldBeNil)