IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Cloud Monitoring: Fix naming (#81654)

Browse Source
This commit is contained in:
Alyssa Bull
2024-02-01 09:05:54 -07:00
committed by GitHub
parent cd0f299297
commit 312fdf9ce0
4 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/plugins/pfs/corelist/corelist_load_gen.go
View File

@@ -34,7 +34,7 @@ func corePlugins(rt *thema.Runtime) []pfs.ParsedPlugin {
return []pfs.ParsedPlugin{
parsePluginOrPanic("public/app/plugins/datasource/alertmanager", "alertmanager", rt),
parsePluginOrPanic("public/app/plugins/datasource/azuremonitor", "grafana_azure_monitor_datasource", rt),
parsePluginOrPanic("public/app/plugins/datasource/cloud-monitoring", "grafana_cloud_monitoring_datasource", rt),
parsePluginOrPanic("public/app/plugins/datasource/cloud-monitoring", "stackdriver", rt),
parsePluginOrPanic("public/app/plugins/datasource/cloudwatch", "cloudwatch", rt),
parsePluginOrPanic("public/app/plugins/datasource/dashboard", "dashboard", rt),
parsePluginOrPanic("public/app/plugins/datasource/elasticsearch", "elasticsearch", rt),

46
pkg/services/pluginsintegration/plugins_integration_test.go
View File

@@ -165,29 +165,29 @@ func verifyCorePluginCatalogue(t *testing.T, ctx context.Context, ps *pluginstor
}
expDataSources := map[string]struct{}{
"cloudwatch": {},
"grafana-azure-monitor-datasource": {},
"grafana-cloud-monitoring-datasource": {},
"elasticsearch": {},
"graphite": {},
"influxdb": {},
"loki": {},
"opentsdb": {},
"prometheus": {},
"tempo": {},
"grafana-testdata-datasource": {},
"grafana-postgresql-datasource": {},
"mysql": {},
"mssql": {},
"grafana": {},
"alertmanager": {},
"dashboard": {},
"input": {},
"jaeger": {},
"mixed": {},
"zipkin": {},
"grafana-pyroscope-datasource": {},
"parca": {},
"cloudwatch": {},
"grafana-azure-monitor-datasource": {},
"stackdriver": {},
"elasticsearch": {},
"graphite": {},
"influxdb": {},
"loki": {},
"opentsdb": {},
"prometheus": {},
"tempo": {},
"grafana-testdata-datasource": {},
"grafana-postgresql-datasource": {},
"mysql": {},
"mssql": {},
"grafana": {},
"alertmanager": {},
"dashboard": {},
"input": {},
"jaeger": {},
"mixed": {},
"zipkin": {},
"grafana-pyroscope-datasource": {},
"parca": {},
}
expApps := map[string]struct{}{

4
pkg/tests/api/plugins/data/expectedListResp.json
View File

@@ -626,7 +626,7 @@
{
"name": "Google Cloud Monitoring",
"type": "datasource",
"id": "grafana-cloud-monitoring-datasource",
"id": "stackdriver",
"enabled": true,
"pinned": false,
"info": {
@@ -652,7 +652,7 @@
},
"latestVersion": "",
"hasUpdate": false,
"defaultNavUrl": "/plugins/grafana-cloud-monitoring-datasource/",
"defaultNavUrl": "/plugins/stackdriver/",
"category": "cloud",
"state": "",
"signature": "internal",

4
public/app/plugins/datasource/cloud-monitoring/plugin.json
View File

@@ -1,14 +1,14 @@
{
"type": "datasource",
"name": "Google Cloud Monitoring",
"id": "grafana-cloud-monitoring-datasource",
"id": "stackdriver",
"category": "cloud",
"metrics": true,
"alerting": true,
"annotations": true,
"backend": true,
"logs": true,
"backend": true,
"includes": [
{
"type": "dashboard",