Add timeout parameter to the example (#80921)
Adding the http timeout parameter to the example to know where is needed in the yaml configuration.
(cherry picked from commit 5c0d7749eb)
Co-authored-by: ausias-armesto <ausiasarmesto@gmail.com>
Docs: restructure manage dashboards page (#81311)
* Added import and troubleshoot dashboards pages
* Moved import dashboards to build dashboards folder
* Updated import dashboards content
* Updated manage dashboards page
* Updated troublshooting dashboards page
* Finalized text for Import dashboards and moved orphaned content to Sharing page
* Made general copy edits to Troubleshooting dashboards
* Moved More examples heading and content from Troubleshooting to Import
* General copy edits to Troubleshooting
* Fixed broken links and made small copy edits
* Fixed broken link
* Removed note and replaced with plain text description of Dashboards page
Added to do for clarifying display of Shared with me section
* Deleted orphaned export content; to be rolled in later
* Copy edits
* Updated Shared with me section
* Copy edits
* Apply suggestions from code review
Co-authored-by: Jack Baldry <jack.baldry@grafana.com>
---------
Co-authored-by: Jack Baldry <jack.baldry@grafana.com>
(cherry picked from commit fb1368d1ef)
updated Grafana Open Source documentation (#80357)
Added missing installation section to run Grafana on Kubernetes
(cherry picked from commit 4e6b0fd9ce)
Co-authored-by: Usman Ahmad <usman.ahmad@grafana.com>
RBAC: Annotation permission migration (#78899)
* add annotation permissions to dashboard managed role and add migrations for annotation permissions
* fix a bug with conditional access level definitions
* add tests
* Update pkg/services/sqlstore/migrations/accesscontrol/dashboard_permissions.go
Co-authored-by: Gabriel MABILLE <gamab@users.noreply.github.com>
* apply feedback
* add batching, fix tests and a typo
* add one more test
* undo unneeded change
* undo unwanted change
* only check the default basic permissions for non-OSS instances
* account for all wildcards and simplify the check a bit
* error handling and extra conditionals to avoid test failures
* fix a bug with admin permissions not appearing for folders
* fix the OSS check
---------
Co-authored-by: Gabriel MABILLE <gamab@users.noreply.github.com>
(cherry picked from commit 048d1e7c86)
Docs: restructure Configure value mappings page (#80103)
* Consolidated four add mappings tasks into one
* Moved images from tasks to types of value mappings section
* Removed edit value mappings section
* Moved sentence about reordering mappings to intro section
* Docs: Add to and update Configure value mappings page (#80104)
* Added to do notes
* Updated intro text and screenshot
* More intro edits
* Updated Types of value mappings section
Replaced bullet list items with headings
Updated text and screenshots of section
* Updated Add a value mapping task
* Recast sentence to remove passive voice
* Replaced local image files with images on admin
(cherry picked from commit c696b5e1dd)
Co-authored-by: Isabel <76437239+imatwawana@users.noreply.github.com>
Alerting docs: recovery threshold (#81069)
* Alerting docs: recovery threshold
* ran prettier
* Adds note that only available in oss
* ran prettier
(cherry picked from commit 030a68bbf7)
Co-authored-by: brendamuir <100768211+brendamuir@users.noreply.github.com>
Explore: Set default time range to now-1h (#81135)
Update default time range in Explore back to now-1h
(cherry picked from commit ebe8c005ce)
Co-authored-by: Piotr Jamróz <pm.jamroz@gmail.com>
Added Descope as an OAuth2 provider (#80050)
* added Descope as an OAuth2 provider
Added docs for customers of ours that have asked us how to use Descope with Grafana. We wanted to make sure they can easily find these docs on both our website and Grafana's.
* Update docs/sources/setup-grafana/configure-security/configure-authentication/generic-oauth/index.md
Co-authored-by: Ieva <vasiljeva.ieva@gmail.com>
* Update docs/sources/setup-grafana/configure-security/configure-authentication/generic-oauth/index.md
Co-authored-by: Ieva <vasiljeva.ieva@gmail.com>
* Update docs/sources/setup-grafana/configure-security/configure-authentication/generic-oauth/index.md
Co-authored-by: lwandz13 <126723338+lwandz13@users.noreply.github.com>
* Changed note to use admonition
* Prettier
Signed-off-by: Jack Baldry <jack.baldry@grafana.com>
---------
Signed-off-by: Jack Baldry <jack.baldry@grafana.com>
Co-authored-by: Ieva <vasiljeva.ieva@gmail.com>
Co-authored-by: lwandz13 <126723338+lwandz13@users.noreply.github.com>
Co-authored-by: Jack Baldry <jack.baldry@grafana.com>
(cherry picked from commit f726ea1e52)
Co-authored-by: Kevin J Gao <32936811+gaokevin1@users.noreply.github.com>
"Release: Updated versions in package to 10.3.2"
Co-authored-by: grafana-delivery-bot[bot] <132647405+grafana-delivery-bot[bot]@users.noreply.github.com>
Elasticsearch: Fix URL creation and allowlist for `/_mapping` requests (#80970)
* Elasticsearch: Fix URL creation for mapping requests
* remove leading slash by default
* add comment for es route
* hardcode `_mapping`
* update doc
(cherry picked from commit 3d033839d7)
Co-authored-by: Sven Grossmann <sven.grossmann@grafana.com>
docs: What’s new & Upgrade guide 10.3 (#80399)
* initial commit for v10.3 whats new
* Added breaking changes guide and updated What's new doc
* Added 10.2.3 in frontmatter of files
* Added content from What's new in Cloud
* Added note about 10.203 and breaking changes section
* Made formatting edits
* Added 10.2.3 test note
* Replaced 10.2.3 notes with asterisks
* Added tag note
* Move reporting item out of D&V section
* Added breaking changes
* Fixed availability notes
* Moved feature from Traces to Profiles and removed Traces section
* Reordered sections
* Replaced Cloud links with OSS links and relrefs with full URLs
* Updated template
* Copy edit
* Clarified outstanding questions
* Updated data source admin permissions note
* Removed duplicate alerting items
* add InfluxDB SQL support
* Ran prettier
* Added availability, video and contributor info
* Ran prettier
* Added youtube video links
* Removed old video link
---------
Co-authored-by: nmarrs <nathanielmarrs@gmail.com>
Co-authored-by: ismail simsek <ismailsimsek09@gmail.com>
(cherry picked from commit 2a53ae637e)
Co-authored-by: Isabel <76437239+imatwawana@users.noreply.github.com>
Nested Folders: Add back syncing of folders between folder and dashboard tbls (#80972)
Add back syncing of folders between folder and dashboard tbls
This partially reverts commit 06d2ae3ada.
(cherry picked from commit 07aa173939)
Folders: Fix creating/updating a folder whose title has leading and trailing spaces (#80909)
* Add tests
* Folders: Fix creating folder whose title has leading and trailing spaces
* Fix folder update
* Remove redundant argument
* Fix test
(cherry picked from commit 4243079cb5)
Docs: restructure Configure data links page (#80100)
* Moved content under Data links heading to intro of page and deleted heading
* Made headings for data link variable types H3s nesting under Data link variables
* Removed unecessary update and delete data links sections
* Made old intro sentence part of new intro
* Made Add a data link section an H2
* Removed unecessary typeahead suggestions section
* Moved variables into tables and capitalized first word of descriptions
* Docs: Edit Configure data links page (#80101)
* Added content update notes
* Rewrote Add a data link section per style guidelines
* Copy edits
* Copy edits
* Copy edits
* Copy edited intro text, removed instances of e.g., and replaced OSS links with Cloud links
* Standardized the format of variables in tables
* Added images (locally) and clarified context menu behaviour
* Removed working notes
* Fixed typo
* Removed images from local and updated image pathways
(cherry picked from commit 9fc789d901)
Co-authored-by: Isabel <76437239+imatwawana@users.noreply.github.com>
`ImagePullSecrets`: Add `GAR` secret to `image_pull_secret` in `.drone.yml` (#80912)
* Add GAR secret to image_pull_secret
* Fix starlark fmt
(cherry picked from commit 65104a7efa)
Elasticsearch: Fix showing of logs when `__source` is log message field (#80804)
Elasticsearch: Fix showing of logs whe __source is log message field
(cherry picked from commit 759c088ac5)
Co-authored-by: Ivana Huckova <30407135+ivanahuckova@users.noreply.github.com>
Explore: Re-enable basic e2e test for Explore (#80617)
Re-enable basic test for Explore
(cherry picked from commit 322cd74b9c)
Co-authored-by: Piotr Jamróz <pm.jamroz@gmail.com>
RBAC: Clean up data source permissions after data source deletion (#80654)
* clean up data source permissions after data source deletion
* remove a comment
(cherry picked from commit def1b05a93)
Co-authored-by: Ieva <ieva.vasiljeva@grafana.com>
* Annotations: Split cleanup into separate queries and deletes to avoid deadlocks on MySQL (#80329)
* Split subquery when cleaning annotations
* update comment
* Raise batch size, now that we pay attention to it
* Iterate in batches
* Separate cancellable batch implementation to allow for multi-statement callbacks, add overload for single-statement use
* Use split-out utility in outer batching loop so it respects context cancellation
* guard against empty queries
* Use SQL parameters
* Use same approach for tags
* drop unused function
* Work around parameter limit on sqlite for large batches
* Bulk insert test data in DB
* Refactor test to customise test data creation
* Add test for catching SQLITE_MAX_VARIABLE_NUMBER limit
* Turn annotation cleanup test to integration tests
* lint
---------
Co-authored-by: Sofia Papagiannaki <1632407+papagian@users.noreply.github.com>
(cherry picked from commit 81c45bfe44)
* revert timing change
* remove log lines, fixed in main
* Two more log lines
---------
Co-authored-by: Alexander Weaver <weaver.alex.d@gmail.com>
Update Grafana Kubernetes installation page (#80569)
Removed the Vimeo and added the YouTube link after an internal discussion with the team.
(cherry picked from commit 0f093c1463)
Co-authored-by: Usman Ahmad <usman.ahmad@grafana.com>
Release: Deprecate latest.json and replace with api call to grafana.com (#80537)
* remove latest.json and replace with api call to grafana.com
* remove latest.json
* Revert "remove latest.json"
This reverts commit bcff43d898.
* Revert "remove latest.json and replace with api call to grafana.com"
This reverts commit 02b867d84e.
* add deprecation message to latest.json
(cherry picked from commit 127decee1e)
Co-authored-by: Ashley Harrison <ashley.harrison@grafana.com>
* NestedFolderPicker: separate toggle to force enable picker without `nestedFolders` (#80461)
* separate nestedFolderPickerOverride toggle to force enable it without nestedFolders
* let's call it newFolderPicker
* update unit tests and keyboard handling
* reduce spacing when no folder open chevron
---------
Co-authored-by: Josh Hunt <joshhunt@users.noreply.github.com>
(cherry picked from commit ec53487c99)
* add config import to NestedFolderPicker
Auth: Use cfg.Raw in OAuthStrategy for loading settings (#80136)
Use cfg.Raw in OAuthStrategy, remove unnecessary tests
(cherry picked from commit eae6adf002)
Co-authored-by: Misi <mgyongyosi@users.noreply.github.com>
This PR has two steps that together create a functional dry-run capability for the migration.
By enabling the feature flag alertingPreviewUpgrade when on legacy alerting it will:
a. Allow all Grafana Alerting background services except for the scheduler to start (multiorg alertmanager, state manager, routes, …).
b. Allow the UI to show Grafana Alerting pages alongside legacy ones (with appropriate in-app warnings that UA is not actually running).
c. Show a new “Alerting Upgrade” page and register associated /api/v1/upgrade endpoints that will allow the user to upgrade their organization live without restart and present a summary of the upgrade in a table.
grafana-delivery-bot[bot]
Isabel
Ieva
Tania
Sofia Papagiannaki
Dimitris Sotirakis
Ashley Harrison
Matthew Jacobson