Commit Graph
44332 Commits
Author SHA1 Message Date
Matthew Jacobson c16f1f5e99 Alerting: Fix provisioned templates being ignored by alertmanager (#69485)
* Alerting: Fix provisioned templates being ignored by alertmanager

Template provisioning sets the template in cfg.TemplateFiles while a recent change
made it so that alertmanager reads cfg.AlertmanagerConfig.Templates instead.

This change fixes the issue on both ends, by having provisioning set boths fields and
reverts the change on the alertmanager side so that it uses cfg.TemplateFiles.
2023-06-02 15:47:43 -04:00
ismail simsek 17836c5895 Chore: Typo fixes in comments (#69475)
Typo fixes in comments
2023-06-02 21:16:38 +02:00
Ida Štambuk 6bc467f8e7 Don't display stackTraces list if passed an empty array (#69484) 2023-06-02 21:10:40 +02:00
Isabel 52da729c83 docs: update TestData screenshots (#69472)
updated screenshots
2023-06-02 14:35:58 -04:00
Ryan McKinley 422684d8b0 Plugins: Support changing plugin IDs (hardcoded) (#67867) 2023-06-02 10:46:12 -07:00
Brendan O'Handley 4fdccef7b3 Prometheus: Fix bug when adding a query in mixed datasource (#69424)
default query needs to not be a function separate from ds
2023-06-02 12:24:42 -04:00
Giordano Ricci 770ae4bbc9 Docs: update what's new for exploreMixedDatasource toggle (#69436) 2023-06-02 17:20:50 +01:00
Mitch Seaman 825c78034f fix minor grammatical error (#69433)
Add "and"
2023-06-02 12:09:12 -04:00
Arati RandSofia Papagiannaki 6cb1a5e368 Nested folders: Add alert rule counts and deletion to folder registry (#67259)
* Let alert rule service implement registry service
* Add count method to RuleStore interface
* Add implementation for deletion of alert rules
* Rename uid to folderUID in registry methods
* Check forceDeleteRule value for registry deletion
* Register alerting store with folder service
* Move folder test functions to separate package
* Add testing for alert rule counting, deletion
* Remove redundant count method
* Fix deleteChildrenInFolder signature
* Update pkg/services/ngalert/store/alert_rule.go
Co-authored-by: Sofia Papagiannaki <1632407+papagian@users.noreply.github.com>
* Add tests for nested folder deletion
* Refactor TestIntegrationNestedFolderService
* Add rules store as parameter for alertng provider

---------

Co-authored-by: Sofia Papagiannaki <1632407+papagian@users.noreply.github.com>
2023-06-02 16:38:02 +02:00
Virginia Cepeda e6e88aa528 Alerting: Display error if repeat interval is lower than group interval (#69413)
* Display error if repeat interval is lower than group interval

* Small change

* Update tests
2023-06-02 11:18:26 -03:00
dependabot[bot]anddependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> 4db6056090 Bump anchore/sbom-action from 0.12.0 to 0.13.4 (#65080)
Bumps [anchore/sbom-action](https://github.com/anchore/sbom-action) from 0.12.0 to 0.13.4.
- [Release notes](https://github.com/anchore/sbom-action/releases)
- [Commits](https://github.com/anchore/sbom-action/compare/v0.12.0...v0.13.4)

---
updated-dependencies:
- dependency-name: anchore/sbom-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-06-02 14:18:07 +00:00
dependabot[bot]anddependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> e4f662e440 Chore(deps): Bump actions/setup-go from 3 to 4 (#64862)
Bumps [actions/setup-go](https://github.com/actions/setup-go) from 3 to 4.
- [Release notes](https://github.com/actions/setup-go/releases)
- [Commits](https://github.com/actions/setup-go/compare/v3...v4)

---
updated-dependencies:
- dependency-name: actions/setup-go
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-06-02 14:17:02 +00:00
Emil Tullstedt dfe092d4b4 Chore: Update featuremgmt codeowners (#69432) 2023-06-02 15:24:51 +02:00
Stephanie Hingtgen 936e62ca43 Secure socks proxy: update show_ui default in default.ini (#69417) 2023-06-02 07:23:05 -06:00
Vardan TorosyanandJack Baldry 0e5e5175b1 Docs: Bring back the alias for external group sync HTTP API page (#69434)
* Docs: Bring back the alias for external group sync HTTP API page

* Update docs/sources/developers/http_api/team_sync.md

Co-authored-by: Jack Baldry <jack.baldry@grafana.com>

---------

Co-authored-by: Jack Baldry <jack.baldry@grafana.com>
2023-06-02 15:01:33 +02:00
Gabriel Goller d850070f09 Docs: Added disableResolveMessage parameter (#66596)
Added disableResolveMessage parameter
2023-06-02 14:28:39 +02:00
Stefan Dunkler e789c2bf03 remove incorrect state changes statement (#65785)
Update index.md
2023-06-02 13:52:19 +02:00
Soham 8165d9934b MSSQL: Change encrypt default value to false (#69351)
change encrypt default value to false
2023-06-02 13:31:43 +02:00
Ivana Huckova 21021502b5 Loki: Remove unused datasource prop from LokiQueryBuilderOptions (#69445)
Loki: Remove unused props from LokiQueryBuilderOptions
2023-06-02 13:26:20 +02:00
Ivana HuckovaandSven Grossmann 06003c98c8 Loki: Add predefined operations functionality behind feature flag (#69379)
* Add feature toggle for lokiPredefinedOperations

* Add config editor for predefined operations

* Add predefined patterns to editor

* Update content in tooltip

* Update public/app/plugins/datasource/loki/configuration/QuerySettings.tsx

Co-authored-by: Sven Grossmann <sven.grossmann@grafana.com>

* Update public/app/plugins/datasource/loki/components/LokiQueryEditor.tsx

Co-authored-by: Sven Grossmann <sven.grossmann@grafana.com>

* Add experimental badge

---------

Co-authored-by: Sven Grossmann <sven.grossmann@grafana.com>
2023-06-02 12:52:36 +02:00
Matias Chomicki ee0ee70aa1 Loki: Exclude queries using DISTINCT from query splitting (#69377)
* Query utils: add function to identify distinct queries

* Chore: return false when the expected node is found

* Query splitting: exclude distinct queries from splitting

* Group queries excluded from splitting
2023-06-02 12:50:23 +02:00
Sven Grossmann b11c264df3 Loki: Fix e2e flakiness (#69441)
fix loki e2e test flakiness by waiting for requests to finish
2023-06-02 12:35:11 +02:00
Levente BaloghandJack Westbrook 7b2bd48677 Plugin Extensions: Custom limits for extensions-per-plugin (#69430)
* feat(plugins): remove global limit on extensions per placement

* feat: add a way to limit extension per plugin at the getter

* test(plugins): fix failing getPluginExtensions test

* refactor(panelmenu): put back limit of 2 extensions per plugin

* tests: add a test for checking all extensions are returned by default

---------

Co-authored-by: Jack Westbrook <jack.westbrook@gmail.com>
2023-06-02 11:09:25 +02:00
Levente Balogh d25cea90b0 Datasources: Make the datasources config extendable by plugins (#68064)
* feat: add a new UI extension type: component

* fix: remove reference to not existing type

* chore: update betterer results

* review: use a single type notation in import

* review: stop exporting `PluginExtensionBase`

* refactor: make extension config types more explicit

By using some repetition now these types are much easier to oversee.

* feat: add a new extension point to the datasources config

* fix: export tcontext type from grafana-data

* chore: update betterer results

* chore: fix tests

* feat: extend the context shared with extensions

* feat: stop omitting jsonData props & update context type

* tests: update tests
2023-06-02 11:01:36 +02:00
renovate[bot]renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>Ashley Harrison
31ecbf7062 Update babel monorepo (#69358)
* Update babel monorepo

* clean up lockfile

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Ashley Harrison <ashley.harrison@grafana.com>
2023-06-02 12:00:12 +03:00
Ashley Harrison 5a98348faf Chore: remove i18n toggle (#69389)
* remove i18n toggle

* remove beta badge on language picker

* remove toggle from go code

* Revert "remove beta badge on language picker"

This reverts commit 3b76300aa7.
2023-06-02 09:24:40 +01:00
dependabot[bot]anddependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> 914d1a94ba Bump slackapi/slack-github-action from 1.23.0 to 1.24.0 (#69425)
Bumps [slackapi/slack-github-action](https://github.com/slackapi/slack-github-action) from 1.23.0 to 1.24.0.
- [Release notes](https://github.com/slackapi/slack-github-action/releases)
- [Commits](https://github.com/slackapi/slack-github-action/compare/v1.23.0...v1.24.0)

---
updated-dependencies:
- dependency-name: slackapi/slack-github-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-06-02 04:58:34 +00:00
Stephanie Hingtgen 29a4e3d7da Secure socks proxy: allow for UI to be disabled (#69408) 2023-06-01 12:58:51 -06:00
Sven Grossmann cb4ad588b9 Log Context: Fix split view button using the wrong query (#69369)
* fix wrong query used in split button

* refactor into one function

* don't act?
2023-06-01 20:39:13 +02:00
lwandz13andBrendan O'Handley 5ac56bcb28 update prometheus template variables doc (#69335)
* edits for clarity

* added 2 new sections on query variable options

* Update docs/sources/datasources/prometheus/template-variables/index.md

Co-authored-by: Brendan O'Handley <brendan.ohandley@grafana.com>

---------

Co-authored-by: Brendan O'Handley <brendan.ohandley@grafana.com>
2023-06-01 11:33:48 -07:00
Taewoo K 4ab863d122 add datasource type (#69407) 2023-06-01 13:35:43 -04:00
Vardan Torosyan 8235f774aa Docs: Rename External Group Sync references to Team Sync (#69395) 2023-06-01 10:48:32 -05:00
Jo e43c3ef87e Devenv: Update auth devenv versions (#69370)
update auth devenv versions
2023-06-01 17:28:55 +02:00
Gábor Farkas 4cbe20ca5a logs: context: removed unused code (#69392) 2023-06-01 15:23:30 +00:00
Misi 28bb960e42 AuthN: Make clientTokenRotation work when Grafana is accessible on a sub url (#69385)
Fix clientTokenRotation for auth-proxy
2023-06-01 17:06:00 +02:00
Tobias Skarhed 56c27a1f0d i18n: Sync extraction with main (#69381)
Run extract on main
2023-06-01 16:53:22 +02:00
Joey 0e90dfcc9c Tracing: Upgrade tracing data source configuration editors (#68764)
* Add tracing config sub sections

* Export common sections and update divider in additional settings section

* Max width and margin bottom

* Add feature name to config link

* Update SpanBarSettings

* remove import
2023-06-01 15:52:40 +01:00
Gábor Farkas e5ec8535ec logs: context: removed unused code (#69383) 2023-06-01 16:38:31 +02:00
Ryan McKinley 51107e9cab Schema: Remove ServiceAccount kind (#69194)
remove service account kind
2023-06-01 07:02:17 -07:00
Ashley Harrison 778963849e News: Expose config option to disable News feed (#69365)
* customize news feed

* remove url customisation
2023-06-01 13:35:05 +01:00
17billion 6d9db92a07 Dashboards: Improve delete dashboard performance due to slow annotations query (#68544)
* Add index on dashboard_id column in annotation table

* Added org_id condition to the delete query for dashboard deletion.
2023-06-01 15:31:03 +03:00
Ludovic Viaud b59533e526 Fix plugin metric (#69368) 2023-06-01 14:24:39 +02:00
Andrej Ocenas fb904852af Pyroscope: Fix wrong defaults when importing query from different datasource (#69307) 2023-06-01 12:14:19 +02:00
Josh Hunt 19153bcbc1 Chore: Update codeowners for api-keys frontend (#69363)
make authnz own api-keys frontend
2023-06-01 11:12:58 +01:00
Domas aa6f16878f TempoQueryEDitor: Respect onRunQuery updates (#69362)
make tempo query editor respect onRunQuery changes
2023-06-01 13:10:00 +03:00
Ashley Harrison 9968a7324d Nested folders: add skeleton scaffolding (#69310)
add skeleton scaffolding
2023-06-01 11:06:28 +01:00
Domas c8e20bff8b NodeGraph: Add "key" prop to context menu items (#69360)
add key to context menu items
2023-06-01 13:01:48 +03:00
Renato Monteiro 63c26e91ee Metrics: Update Help to mention active viewers (#63384) 2023-06-01 11:56:43 +02:00
linomanandptz-xyt 676e5de3d2 Reword JWT config claim (#69356)
Co-authored-by: ptz-xyt <104002657+ptz-xyt@users.noreply.github.com>
2023-06-01 11:15:27 +02:00
dependabot[bot]anddependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> 96d8b0c659 Bump actions/stale from 6 to 8 (#65309)
Bumps [actions/stale](https://github.com/actions/stale) from 6 to 8.
- [Release notes](https://github.com/actions/stale/releases)
- [Changelog](https://github.com/actions/stale/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/stale/compare/v6...v8)

---
updated-dependencies:
- dependency-name: actions/stale
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-06-01 09:31:20 +01:00