Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PMM-6695 grafana v7.3.7 #60

Merged
merged 1,232 commits into from
Feb 18, 2021
Merged

PMM-6695 grafana v7.3.7 #60

merged 1,232 commits into from
Feb 18, 2021

Conversation

lunaticusgreen
Copy link

What this PR does / why we need it: Upgrades grafana to version 7.3.7

Which issue(s) this PR fixes: PMM-6695

Fixes #

Special notes for your reviewer:

peterholmberg and others added 30 commits October 13, 2020 09:11
)

* end 2 end

* fix import

* refactor

* introduce securedata

* check err

* use testify instead of convey

* cleanup test

* cleanup test

* blob time

* rename funcs
* expire with existng cleanup service

* expire with new temp user service

* make Drone happy :)

* add expiry status

* remove other approach

* cleanup

* add test for idempotency

* add migration from datetime to unix ts

* update cmd names

* change lifetime config to duration

* remove unnecessart formatting

* add comment

* update docs

* remove max bound and introduce min error

* simplify sql

* remove comment

* allow any outstanding to exist for at least 24 hours

* revert created ts change

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

* add extra state check to cleanup step

Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com>
…ctivity (grafana#28201)

* Automation: New label command

Adds a label command "no new info" 

That closes issue with standard message. 

We could also add an automated scheduled task that does this automatically: 
https://github.com/microsoft/vscode/blob/master/.github/workflows/needs-more-info-closer.yml

* Update .github/commands.json

Co-authored-by: Dominik Prokop <dominik.prokop@grafana.com>

* Update .github/commands.json

Co-authored-by: Marcus Olsson <marcus.olsson@hey.com>

Co-authored-by: Dominik Prokop <dominik.prokop@grafana.com>
Co-authored-by: Marcus Olsson <marcus.olsson@hey.com>
…_tag tables (grafana#28166)

Add non-unique indices to alert_notification_state and alert_rule_tag tables for 
column alert_id.

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

Fixes grafana#22890
* Fallback to the old field only if new field is undefined
Hi - I have observed Dot(.) is missing in many places of paragraphs in document. So raising this PR.

Added Dot(.) to below line
This page shows how to use regex to filter/modify values in the variable dropdown.

Thanks,
Ashish
Hi - Added Dot(.) at the end of line.

Thanks,
Ashish
* Added link to Plugins

HI - Added link to Plugins for quick redirection

Thanks,
Ashish

* Update configuration.md
* Use latest @grafana/eslint-config

* Updated lockfile
Hi, I have added hyperlink to alert notification for quick redirection.

Thanks,
Ashish
* Use latest @grafana/eslint-config

* Version bump
Hi - I have added hyperlink to Prometheus. Pls review and merge.

Thanks,
Ashish
* Add tempo datasource, mostly copy of jaeger datasource code

* Add label to input field

* Add logo

* Remove access option from configuration

* Add white space to field label

* Add documentation

* Fix link in docs

* Update public/app/plugins/datasource/tempo/ConfigEditor.tsx

Co-authored-by: Zoltán Bedi <zoltan.bedi@gmail.com>

* Update public/app/plugins/datasource/tempo/QueryField.tsx

Co-authored-by: Zoltán Bedi <zoltan.bedi@gmail.com>

* Add data source to the docs menu

* Add simple implementation for testDatasource

* Wording updates to the docs.

Co-authored-by: Zoltán Bedi <zoltan.bedi@gmail.com>
Hi - Added Dot(.) to end the paragraph.

Thanks
* Build: handles verify-repos failures correctly

* shellcheck
Hi - Added Dot at the end of line to make it consistent.

Thanks,
Ashish
…a#28221)

* Azure: Fixes merging of requests with different Azure sources

* Refactor: Changes return type
Hi - Made minor change grafana to Grafana in More examples section.

Thanks,
Ashish
Hi - There is minor change grafana to Grafana in scripted-dashboards page.

Thanks,
Ashish
* NamedColors: Refactoring, performance improvements, and simplifications

* More simplifification

* Updated to use new function

* Updates

* Updates

* Updated BarGauge to use fallback color intead of magic string

* Updates

* Fixed unused import
* Add new logql v2 functions

* Fix autocompletion if missing ending }

* Refactor operators regex, add pipe operator and tests

* Add parsers

* Update tests

* Add parsers to suggestions, add test

* Add operators to syntax

* Create pipe operator autocomplete + highlighting + add tests

* Add to documentation that pipe operations are available in in Loki 2.0+

* Update snapshot test

* Update operators list, add regex quotes and move cursor

* Fix spelling

* Update documentation

* Update
Hi - Made minor change grafana to Grafana.

Thanks,
Ashish
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
* Use new editor

* Add basic fields

* Add labels

* Add ids

* Add ManualEntryEditor

* Use tooltip prop

* Switch to inline labels

* Fix inline label tooltip position

* Allow resetting max-width

* Replace form inputs

* Add random walk editor

* separate editors

* Add logs and endpoints fields

* Add PredictablePulseEditor

* Add CSVWaveEditor

* Add grow prop

* Add default query

* Fix types

* Fix manual editor

* Fix type issues

* Handle scenario change

* Sort scenarios by label

* Add ManualEditor test

* Fix label height

* test manual editor

* Update test

* Setup QueryEditor tests

* Fix selected value

* Connect CSVWaveEditor

* Convert stream data to numbers

* Fix random walk editor

* Cleanup

* Convert scenarios to ts

* Remove extra icon styles

* Minor tweaks

* Update e2e tests

* Remove useEffect

* Add missing aria-labels

* Use new button components
* intial frontend resolution/redirection logic

* backend scaffolding

* enough of the frontend to actually test end to end

* bugfixes

* add tests

* cleanup

* explore too hard for now

* fix build

* Docs: add docs

* FE test

* redirect directly from backend

* validate incoming uids

* add last_seen_at

* format documentation

* more documentation feedback

* very shaky migration of get route to middleware

* persist unix timestamps

* add id, orgId to table

* fixes for orgId scoping

* whoops forgot the middleware

* only redirect to absolute URLs under the AppUrl domain

* move lookup route to /goto/:uid, stop manually setting 404 response code

* renaming things according to PR feedback

* tricky deletion

* sneaky readd

* fix test

* more BE renaming

* FE updates -- no more @ts-ignore hacking :) and accounting for subpath

* Simplify code

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>

* Short URLs: Drop usage of bus

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>

* ShortURLService: Make injectable

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>

* Rename file

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>

* Add handling of url parsing and creating of full shortURL to backend

* Update test, remove unused imports

* Update pkg/api/short_urls.go

Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>

* Add correct import

* Pass context to short url service

* Remove not needed error log

* Rename dto and field to denote URL rather than path

* Update api docs based on feedback/suggestion

* Rename files to singular

* Revert to send relative path to backend

* Fixes after review

* Return dto when creating short URL that includes the full url

Use full url to provide shorten URL to the user

* Fix after review

* Fix relative url path when creating new short url

Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>
Co-authored-by: Ivana <ivana.huckova@gmail.com>
Co-authored-by: Ivana Huckova <30407135+ivanahuckova@users.noreply.github.com>
Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com>
# Conflicts:
#	.circleci/config.yml
#	.github/workflows/publish.yml
#	contribute/style-guides/documentation-style-guide.md
#	docs/sources/datasources/azuremonitor.md
#	docs/sources/datasources/influxdb.md
#	docs/sources/datasources/loki.md
#	docs/sources/features/datasources/graphite.md
#	docs/sources/panels/field-configuration-options.md
#	docs/sources/panels/transformations.md
#	docs/sources/panels/visualizations/graph-panel.md
#	docs/sources/variables/variable-types/global-variables.md
#	docs/sources/whatsnew/whats-new-in-v7-1.md
#	go.mod
#	go.sum
#	lerna.json
#	package.json
#	packages/grafana-data/package.json
#	packages/grafana-data/src/field/fieldOverrides.test.ts
#	packages/grafana-data/src/field/fieldOverrides.ts
#	packages/grafana-data/src/transformations/transformers.ts
#	packages/grafana-data/src/transformations/transformers/merge.test.ts
#	packages/grafana-data/src/transformations/transformers/merge.ts
#	packages/grafana-data/src/transformations/transformers/seriesToRows.test.ts
#	packages/grafana-data/src/transformations/transformers/seriesToRows.ts
#	packages/grafana-data/src/types/data.ts
#	packages/grafana-data/src/types/datasource.ts
#	packages/grafana-data/src/types/panel.ts
#	packages/grafana-data/src/utils/dataLinks.test.ts
#	packages/grafana-data/src/utils/dataLinks.ts
#	packages/grafana-data/src/utils/url.ts
#	packages/grafana-data/src/valueFormats/categories.ts
#	packages/grafana-e2e-selectors/package.json
#	packages/grafana-e2e/package.json
#	packages/grafana-e2e/src/flows/addPanel.ts
#	packages/grafana-runtime/package.json
#	packages/grafana-runtime/src/utils/DataSourceWithBackend.ts
#	packages/grafana-toolkit/package.json
#	packages/grafana-ui/package.json
#	packages/grafana-ui/src/components/FileUpload/FileUpload.story.tsx
#	packages/grafana-ui/src/components/FileUpload/FileUpload.tsx
#	packages/grafana-ui/src/components/Table/JSONViewCell.tsx
#	packages/grafana-ui/src/components/TimePicker/TimeRangeInput.story.tsx
#	packages/grafana-ui/src/components/ValueMappingsEditor/ValueMappingsEditor.test.tsx
#	packages/grafana-ui/src/themes/ThemeContext.tsx
#	packages/jaeger-ui-components/package.json
#	packages/jaeger-ui-components/src/TraceTimelineViewer/SpanDetail/index.tsx
#	pkg/components/gtime/gtime_test.go
#	pkg/middleware/auth.go
#	pkg/plugins/dashboard_importer.go
#	pkg/services/sqlstore/alert_notification_test.go
#	pkg/services/sqlstore/migrations/alert_mig.go
#	pkg/tsdb/azuremonitor/applicationinsights-datasource.go
#	pkg/tsdb/azuremonitor/azuremonitor-datasource.go
#	pkg/tsdb/azuremonitor/azuremonitor-datasource_test.go
#	pkg/tsdb/cloudwatch/log_actions.go
#	pkg/tsdb/frame_util_test.go
#	pkg/tsdb/influxdb/flux/builder.go
#	pkg/tsdb/influxdb/flux/converters.go
#	pkg/tsdb/influxdb/flux/executor_test.go
#	pkg/tsdb/influxdb/flux/flux.go
#	pkg/tsdb/influxdb/flux/testdata/renamed.golden.txt
#	plugins-bundled/internal/input-datasource/package.json
#	public/app/core/logs_model.ts
#	public/app/core/services/bridge_srv.test.ts
#	public/app/core/services/bridge_srv.ts
#	public/app/core/utils/explore.test.ts
#	public/app/core/utils/explore.ts
#	public/app/core/utils/richHistory.ts
#	public/app/core/utils/standardTransformers.ts
#	public/app/features/admin/AdminListOrgsPage.tsx
#	public/app/features/dashboard/components/DashboardSettings/SettingsCtrl.ts
#	public/app/features/dashboard/components/DashboardSettings/TimePickerSettings.tsx
#	public/app/features/dashboard/components/Inspector/InspectJSONTab.tsx
#	public/app/features/dashboard/components/SubMenu/DashboardLinks.tsx
#	public/app/features/dashboard/components/SubMenu/DashboardLinksDashboard.tsx
#	public/app/features/dashboard/components/SubMenu/SubMenu.tsx
#	public/app/features/dashboard/containers/DashboardPage.tsx
#	public/app/features/explore/Explore.test.tsx
#	public/app/features/explore/Explore.tsx
#	public/app/features/explore/ExploreToolbar.tsx
#	public/app/features/explore/QueryRow.tsx
#	public/app/features/explore/state/actionTypes.ts
#	public/app/features/explore/state/actions.test.ts
#	public/app/features/explore/state/actions.ts
#	public/app/features/explore/state/reducers.test.ts
#	public/app/features/explore/state/reducers.ts
#	public/app/features/explore/utils/ResultProcessor.test.ts
#	public/app/features/explore/utils/ResultProcessor.ts
#	public/app/features/explore/utils/links.test.ts
#	public/app/features/plugins/AppRootPage.tsx
#	public/app/features/plugins/PluginListPage.tsx
#	public/app/features/plugins/__snapshots__/PluginListPage.test.tsx.snap
#	public/app/features/templating/template_srv.test.ts
#	public/app/features/templating/template_srv.ts
#	public/app/features/variables/state/actions.test.ts
#	public/app/plugins/datasource/cloudwatch/datasource.ts
#	public/app/plugins/datasource/cloudwatch/specs/datasource.test.ts
#	public/app/plugins/datasource/cloudwatch/types.ts
#	public/app/plugins/datasource/elasticsearch/datasource.test.ts
#	public/app/plugins/datasource/elasticsearch/elastic_response.ts
#	public/app/plugins/datasource/influxdb/components/FluxQueryEditor.tsx
#	public/app/plugins/datasource/influxdb/datasource.ts
#	public/app/plugins/datasource/influxdb/module.ts
#	public/app/plugins/datasource/loki/components/LokiExploreQueryEditor.tsx
#	public/app/plugins/datasource/loki/components/LokiQueryEditor.test.tsx
#	public/app/plugins/datasource/loki/components/LokiQueryEditor.tsx
#	public/app/plugins/datasource/loki/components/__snapshots__/LokiQueryEditor.test.tsx.snap
#	public/app/plugins/datasource/loki/datasource.test.ts
#	public/app/plugins/datasource/loki/datasource.ts
#	public/app/plugins/datasource/loki/result_transformer.ts
#	public/app/plugins/datasource/testdata/partials/query.editor.html
#	public/app/plugins/panel/text/TextPanel.tsx
#	public/app/types/explore.ts
#	yarn.lock
# Conflicts:
#	yarn.lock
@nicolalamacchia
Copy link

nicolalamacchia commented Feb 15, 2021

Is master the right branch this PR should be merged to? Yes, of course it is, it's just the PR for the new version is huge 😅

fabio-silva
fabio-silva previously approved these changes Feb 16, 2021
# Conflicts:
#	package.json
#	public/app/features/integrated-alerting/IntegratedAlertingPage.tsx
#	public/app/features/integrated-alerting/components/NotificationChannel/AddNotificationChannelModal/AddNotificationChannelModal.tsx
#	public/app/features/integrated-alerting/components/NotificationChannel/AddNotificationChannelModal/AddNotificationChannelModal.utils.ts
#	yarn.lock
@lunaticusgreen lunaticusgreen merged commit e53c02b into master Feb 18, 2021
@lunaticusgreen lunaticusgreen deleted the PMM-6695-grafana-v7.3.7 branch February 18, 2021 07:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.