Stackdriver: Rename Stackdriver to Google Cloud Monitoring #25807

papagian · 2020-06-24T13:56:07Z

What this PR does / why we need it:
It renames Stackdriver datasource to Google Cloud Monitoring

This is an alternative approach to #25760 that does not change the plugin id.

Which issue(s) this PR fixes:

Special notes for your reviewer:
Existing dashboards should work without any change.
Imported dashboards (exported from previous grafana versions) should load successfully.

A complementary PR adding updated images for the documentation will follow up.

Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com>

public/app/plugins/datasource/cloud-monitoring/components/AlignmentPeriods.tsx

marefr

Only reviewed the code so far. This attempt looks much more straight forward I think, great 👍 Added some minor suggestions. Lets see what @daniellee thinks about the approach keeping the stackdriver plugin id.

On another note - not sure why you did open a new PR - now I had to go through all the files again :) But that's fine. For next time, consider rebase instead.

docs/sources/features/datasources/cloudmonitoring.md

Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com> Co-authored-by: Tobias Skarhed <1438972+tskarhed@users.noreply.github.com>

…no-ds-type-change

marefr

Some suggestions

docs/sources/features/datasources/cloudmonitoring.md

Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com>

pkg/plugins/frontend_plugin.go

Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com>

marefr

Tried it out now and seems to work as expected. Great. Added a minor suggestion.

Could you please open a PR for images so that we can verify that before merging this?

public/app/plugins/datasource/cloud-monitoring/README.md

Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com>

daniellee

Two suggestions to add a reference to the data source formerly being named Stackdriver - in the readme and in the plugin description which you see when adding a data source.

LGTM and everything works as it should.

daniellee · 2020-06-28T21:47:41Z

public/app/plugins/datasource/cloud-monitoring/plugin.json

@@ -16,8 +16,8 @@
    "description": "Data source for Google's monitoring service",


Can you add "formerly named Stackdriver" or similar here?

daniellee · 2020-06-28T21:48:46Z

public/app/plugins/datasource/cloud-monitoring/README.md

@@ -0,0 +1,7 @@
+# Google Cloud Monitoring Data Source - Native Plugin
+
+Grafana ships with built-in support for Google Cloud Monitoring. You just have to add it as a data source and you will be ready to build dashboards for your Cloud Monitoring metrics.


Can you add "formerly named Stackdriver" somewhere here.

bergquist

Code looks good. Great work! :)

pkg/models/datasource.go

Co-authored-by: Carl Bergquist <carl@grafana.com>

…no-ds-type-change

marefr

Great. However, logo in docs doesn't look right:

Should probably handle that in website, but question is if you're changing the logo in docs shouldn't you change it for data source in Grafana as well? If not, the logo in docs shouldn't be changed I guess.

papagian · 2020-06-30T15:35:13Z

Great. However, logo in docs doesn't look right:

Should probably handle that in website, but question is if you're changing the logo in docs shouldn't you change it for data source in Grafana as well? If not, the logo in docs shouldn't be changed I guess.

I have reverted to the old logo content:
https://github.com/grafana/website/pull/1737

marefr

LGTM 🎉

* Update backend * Update frontend * Keep old plugin id * Update docs * Place doc images to a new directory * Legacy support for stackdriver-auto alignment * Consistent plugin name * Apply suggestions from code review Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com> Co-authored-by: Tobias Skarhed <1438972+tskarhed@users.noreply.github.com> * Update docs * Update public/app/plugins/datasource/cloud-monitoring/README.md Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com> * Add reference to the data source formerly being named Stackdriver * Update pkg/models/datasource.go Co-authored-by: Carl Bergquist <carl@grafana.com> * Fix gofmt Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com> Co-authored-by: Tobias Skarhed <1438972+tskarhed@users.noreply.github.com> Co-authored-by: Carl Bergquist <carl@grafana.com>

* master: Azure/Log Analytics: return more error information (grafana#25937) PanelHeader: Fixed loading icon position (grafana#25949) Arrow: when exporting arrow use the calculated names (grafana#25871) Fix strict null errors that resulted from search (grafana#25950) Stackdriver: Rename Stackdriver to Google Cloud Monitoring (grafana#25807)

* Update backend * Update frontend * Keep old plugin id * Update docs * Place doc images to a new directory * Legacy support for stackdriver-auto alignment * Consistent plugin name * Apply suggestions from code review Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com> Co-authored-by: Tobias Skarhed <1438972+tskarhed@users.noreply.github.com> * Update docs * Update public/app/plugins/datasource/cloud-monitoring/README.md Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com> * Add reference to the data source formerly being named Stackdriver * Update pkg/models/datasource.go Co-authored-by: Carl Bergquist <carl@grafana.com> * Fix gofmt Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com> Co-authored-by: Tobias Skarhed <1438972+tskarhed@users.noreply.github.com> Co-authored-by: Carl Bergquist <carl@grafana.com>

* graph with new controls * graph with new controls * Fix categories * fix test imports * Chore: Fix spelling (#25905) * grafana-ui: Make output chunks correct (#25922) * Explore/Loki: Show results of instant queries only in table and time series only in graph (#25845) * Show results of instant queries only in table and rest in graph * Add type to QueryResultMeta * Update log row hover background only if context is not open * Revert "Update log row hover background only if context is not open" This reverts commit 144197c. * Explore/Loki: Fix field type in table for instant queries (#25907) * Update field type for instant queries to number * Remove fieldtype as in prometheus * Revert "Remove fieldtype as in prometheus" This reverts commit f887ad1. * Chore: Disable scopelint for tests (#25923) Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * grafana/ui: Fix storybook dev (#25928) * Minimize css and js only for storybook build * Update CodeEditor story, make it internal * Update storybook webpack config * TimeZonePicker: added possibility to toggle if internal time zones should be included or not. (#25934) * made some small adjustments after feedback. * made the flag optional. * Docker: Upgrade to base on Alpine 3.12 (#25936) Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * DataLinks: Add internal links in table and allow custom query (#25613) * Add internal links in table and with custom query * Add specific types for internal and external link * Change the datalink types to be more backward compatible * Refactor the link utils for explore * Add internal linking to table panels * Fix derived field condition * Prettify * Add and fix tests * Prettify * Fix imports and tests * Remove unused type * Update packages/grafana-data/src/types/explore.ts Co-authored-by: Dominik Prokop <dominik.prokop@grafana.com> * Update packages/grafana-data/src/types/explore.ts Co-authored-by: Dominik Prokop <dominik.prokop@grafana.com> Co-authored-by: Dominik Prokop <dominik.prokop@grafana.com> * CircleCI: Upgrade grabpl (#25939) Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Provisioning: Use folders structure from the file system to create desired folders in dashboard provisioning. (#23117) Fixes #12016 * Added options to customize chart data listening (#25918) * Explore: Remove legend formatting when switching from panel to Explore (#25848) * Remove legend formatting when switching from panel to explore * Add test coverage * Query history: Add search for query history and starred queries (#25747) * Add searching functionality to Queries tab * Implement search for starred queries * Update tests and add test coverage for searching * Changes based on provided feedback * Remove redundant storing of results * Update naming of onSearchFilterChange function in tests * Update filterQueriesBySearchFilter function * Update filterQueriesBySearchFilter function * Debounce search * Remove console.log() * Use useDebouncedCallback * Update tests, remove redundant props * When in starred, search only in starred * Add timefilter as dependency * Remove redundant dependency, refactor * Grafana-UI: Add FileUpload (#25835) * Grafana UI: Setup component * Grafana UI: DashboardFileUpload => FileUpload * Grafana UI: Expand docs * Grafana UI: Add className * Grafana UI: Update import * Grafana UI: Clarify props * Update packages/grafana-ui/src/components/FileUpload/FileUpload.tsx Co-authored-by: Tobias Skarhed <1438972+tskarhed@users.noreply.github.com> * Grafana UI: Style icon * Grafana UI: Show uploaded file name * Grafana UI: Add tests * Grafana UI: Add useStyles + useCallback * Grafana UI: Remove stylesFactory * Grafana UI: Revert to useTheme Co-authored-by: Tobias Skarhed <1438972+tskarhed@users.noreply.github.com> * Fix: Value mappings match against string values (#25929) * Use standard input for value mappings value * add test and case for matching string values * re add number on rangemap * remove FieldTypeNumber required * Docs: Changelog update 7.05 & latest.json update (#25941) * Docs: Changelog update for 7.0.5 * Update latest.json * Fixed alignment * Stackdriver: Rename Stackdriver to Google Cloud Monitoring (#25807) * Update backend * Update frontend * Keep old plugin id * Update docs * Place doc images to a new directory * Legacy support for stackdriver-auto alignment * Consistent plugin name * Apply suggestions from code review Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com> Co-authored-by: Tobias Skarhed <1438972+tskarhed@users.noreply.github.com> * Update docs * Update public/app/plugins/datasource/cloud-monitoring/README.md Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com> * Add reference to the data source formerly being named Stackdriver * Update pkg/models/datasource.go Co-authored-by: Carl Bergquist <carl@grafana.com> * Fix gofmt Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com> Co-authored-by: Tobias Skarhed <1438972+tskarhed@users.noreply.github.com> Co-authored-by: Carl Bergquist <carl@grafana.com> * Fix strict null errors that resulted from search (#25950) * Arrow: when exporting arrow use the calculated names (#25871) * PanelHeader: Fixed loading icon position (#25949) * PanelHeader: Fixed loading icon position * revert back to text weak color * Azure/Log Analytics: return more error information (#25937) When there is an error message in the HTTP response, this copies that error so it is relayed to the user by being shown in the frontend. This also makes it so when there is an error the interpolated query string (ExecutedQueryString) is returned so users can see it in the query inspector. * Azure: Multiple dimension support for Azure Monitor Service (#25947) Azure Monitor (metrics) support multiple dimensions instead of just one. Co-authored-by: Ryan McKinley <ryantxu@gmail.com> * Docs: Update alert-list-panel.md (#25779) Fixed minor typo and format updates * Docs: Update add-a-panel.md (#25780) * Linting fixes for the provisioning package (#25690) * Chore: whatwg-fetch version bump (#25952) * Use latest fetch polyfill/shim * Updated lockfile * Monaco: option to hide line numbers (#25920) * Docs: Reorganize reference topics (#25915) * moved annotations.md * Update annotations.md * moved dashboard_folders.md * moved dashboard_history.md * moved playlist.md * moved search.md * migrations test * docs: spelling (#24383) * Docs: spelling * Docs: spelling (contribute/ directory) * Drop whats-new-in changes * migrations test Co-authored-by: Dominik Prokop <dominik.prokop@grafana.com> Co-authored-by: Richard Hartmann <RichiH@users.noreply.github.com> Co-authored-by: Ivana Huckova <30407135+ivanahuckova@users.noreply.github.com> Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com> Co-authored-by: Marcus Andersson <marcus.andersson@grafana.com> Co-authored-by: Andrej Ocenas <mr.ocenas@gmail.com> Co-authored-by: Maksim Nabokikh <32434187+nabokihms@users.noreply.github.com> Co-authored-by: Steven Vachon <contact@svachon.com> Co-authored-by: Alex Khomenko <Clarity-89@users.noreply.github.com> Co-authored-by: Tobias Skarhed <1438972+tskarhed@users.noreply.github.com> Co-authored-by: Peter Holmberg <peterholmberg@users.noreply.github.com> Co-authored-by: Torkel Ödegaard <torkel@grafana.com> Co-authored-by: Sofia Papagiannaki <papagian@users.noreply.github.com> Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com> Co-authored-by: Carl Bergquist <carl@grafana.com> Co-authored-by: Kyle Brandt <kyle@grafana.com> Co-authored-by: Diana Payton <52059945+oddlittlebird@users.noreply.github.com> Co-authored-by: Josh Soref <jsoref@users.noreply.github.com>

papagian and others added 9 commits June 24, 2020 10:38

Update backend

f9c3328

Update frontend

ff1fd9b

Keep old plugin id

73d1319

Update docs

a270af9

Apply suggestions from code review

706c4f2

Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com>

Place doc images to a new directory

a550ebd

fixup

9ba51ce

Legacy support for stackdriver-auto alignment

0a0f426

Consistent plugin name

a709be2

papagian requested review from oddlittlebird and a team as code owners June 24, 2020 13:56

papagian requested review from a team, kylebrandt, mckn, tskarhed and daniellee and removed request for a team June 24, 2020 13:56

This was referenced Jun 24, 2020

Stackdriver: Rename Stackdriver to Google Cloud Monitoring #25668

Closed

Stackdriver: Rename Stackdriver to Google Cloud Monitoring #25760

Closed

papagian requested a review from marefr June 24, 2020 14:00

tskarhed reviewed Jun 24, 2020

View reviewed changes

public/app/plugins/datasource/cloud-monitoring/components/AlignmentPeriods.tsx Outdated Show resolved Hide resolved

marefr suggested changes Jun 24, 2020

View reviewed changes

docs/sources/features/datasources/cloudmonitoring.md Outdated Show resolved Hide resolved

docs/sources/features/datasources/cloudmonitoring.md Outdated Show resolved Hide resolved

papagian and others added 3 commits June 24, 2020 20:26

Apply suggestions from code review

6b1922c

Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com> Co-authored-by: Tobias Skarhed <1438972+tskarhed@users.noreply.github.com>

Merge remote-tracking branch 'origin/master' into rename-stackdriver-…

75bc444

…no-ds-type-change

Update docs

d7e3306

marefr reviewed Jun 25, 2020

View reviewed changes

docs/sources/features/datasources/cloudmonitoring.md Outdated Show resolved Hide resolved

docs/sources/features/datasources/cloudmonitoring.md Outdated Show resolved Hide resolved

Update docs/sources/features/datasources/cloudmonitoring.md

29e1732

Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com>

marefr reviewed Jun 25, 2020

View reviewed changes

pkg/plugins/frontend_plugin.go Outdated Show resolved Hide resolved

papagian commented Jun 25, 2020

View reviewed changes

pkg/plugins/frontend_plugin.go Outdated Show resolved Hide resolved

Apply suggestions from code review

2344e66

Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com>

papagian added this to the 7.1 milestone Jun 26, 2020

marefr suggested changes Jun 26, 2020

View reviewed changes

public/app/plugins/datasource/cloud-monitoring/README.md Outdated Show resolved Hide resolved

Update public/app/plugins/datasource/cloud-monitoring/README.md

0f2f3c9

Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com>

daniellee approved these changes Jun 28, 2020

View reviewed changes

daniellee added datasource/GoogleCloudMonitoring add to changelog labels Jun 29, 2020

Add reference to the data source formerly being named Stackdriver

e83bc02

bergquist reviewed Jun 29, 2020

View reviewed changes

pkg/models/datasource.go Show resolved Hide resolved

papagian and others added 3 commits June 30, 2020 09:17

Update pkg/models/datasource.go

f95fdb1

Co-authored-by: Carl Bergquist <carl@grafana.com>

Merge remote-tracking branch 'origin/master' into rename-stackdriver-…

7bc38f3

…no-ds-type-change

Fix gofmt

db2a8ed

papagian requested a review from marefr June 30, 2020 07:08

marefr suggested changes Jun 30, 2020

View reviewed changes

marefr approved these changes Jun 30, 2020

View reviewed changes

papagian merged commit 4bb3f66 into master Jun 30, 2020

papagian deleted the rename-stackdriver-no-ds-type-change branch June 30, 2020 15:47

mckn mentioned this pull request Jul 1, 2020

Chore: added changelog for 7.1.0-beta1. #25978

Merged

marefr mentioned this pull request Apr 28, 2023

Pyroscope: Change the data source id with migrations #67490

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Stackdriver: Rename Stackdriver to Google Cloud Monitoring #25807

Stackdriver: Rename Stackdriver to Google Cloud Monitoring #25807

papagian commented Jun 24, 2020

marefr left a comment

marefr left a comment

marefr left a comment

daniellee left a comment

daniellee Jun 28, 2020

daniellee Jun 28, 2020

bergquist left a comment

marefr left a comment

papagian commented Jun 30, 2020

marefr left a comment

		@@ -16,8 +16,8 @@
		"description": "Data source for Google's monitoring service",

		@@ -0,0 +1,7 @@
		# Google Cloud Monitoring Data Source - Native Plugin

		Grafana ships with built-in support for Google Cloud Monitoring. You just have to add it as a data source and you will be ready to build dashboards for your Cloud Monitoring metrics.

Stackdriver: Rename Stackdriver to Google Cloud Monitoring #25807

Stackdriver: Rename Stackdriver to Google Cloud Monitoring #25807

Conversation

papagian commented Jun 24, 2020

marefr left a comment

Choose a reason for hiding this comment

marefr left a comment

Choose a reason for hiding this comment

marefr left a comment

Choose a reason for hiding this comment

daniellee left a comment

Choose a reason for hiding this comment

daniellee Jun 28, 2020

Choose a reason for hiding this comment

daniellee Jun 28, 2020

Choose a reason for hiding this comment

bergquist left a comment

Choose a reason for hiding this comment

marefr left a comment

Choose a reason for hiding this comment

papagian commented Jun 30, 2020

marefr left a comment

Choose a reason for hiding this comment