grafana

Commit Graph

Author	SHA1	Message	Date
Horst Gutmann	a9873db0f9	[v9.3.x] Chore: Update SAML lib (#844 ) * AuthJWT: Fix JWT query param leak (CVE-2023-1387) [9.3.x] (#826) * fix JWT query param leak Co-authored-by: Gabriel MABILLE <gamab@users.noreply.github.com> Co-authored-by: Kalle Persson <kalle.persson@grafana.com> * skip broken test --------- Co-authored-by: Gabriel MABILLE <gamab@users.noreply.github.com> Co-authored-by: Kalle Persson <kalle.persson@grafana.com> * Update SAML lib * Replace golang.org/x/net with v0.7.0 * Revert "Replace golang.org/x/net with v0.7.0" This reverts commit d17e6bc4226bb7b3ef82c99541d68cace43dfa2e. --------- Co-authored-by: Jo <joao.guerreiro@grafana.com> Co-authored-by: Gabriel MABILLE <gamab@users.noreply.github.com> Co-authored-by: Kalle Persson <kalle.persson@grafana.com> Co-authored-by: Mihaly Gyongyosi <mgyongyosi@users.noreply.github.com>	3 years ago
Horst Gutmann	77bb24bc9e	AuthJWT: Fix JWT query param leak (CVE-2023-1387) [9.3.x] (#843 ) * fix JWT query param leak Co-authored-by: Gabriel MABILLE <gamab@users.noreply.github.com> Co-authored-by: Kalle Persson <kalle.persson@grafana.com> * skip broken test --------- Co-authored-by: jguer <me@jguer.space> Co-authored-by: Gabriel MABILLE <gamab@users.noreply.github.com> Co-authored-by: Kalle Persson <kalle.persson@grafana.com>	3 years ago
Grot (@grafanabot)	73d0526572	Release: Bump version to 9.3.14 (#67256 ) "Release: Updated versions in package to 9.3.14"	3 years ago
Grot (@grafanabot)	db12eb4644	[v9.3.x] Doc: Fix typo (#67241 ) Doc: Fix typo (#66929) Update index.md (cherry picked from commit `ff61772218`) Co-authored-by: oneoneonepig <oneoneonepig@users.noreply.github.com>	3 years ago
Grot (@grafanabot)	79f1b9266d	[v9.3.x] Docs: adds legacy wording to api docs (#66940 ) Docs: adds legacy wording to api docs (#66937) adds legacy wording to api docs (cherry picked from commit `9b529ef0cd`) Co-authored-by: brendamuir <100768211+brendamuir@users.noreply.github.com>	3 years ago
Grot (@grafanabot)	08fef79869	[v9.3.x] [docs] remove auth/saml alias from team sync page (#66854 ) [docs] remove auth/saml alias from team sync page (#66796) removed auth/saml alias from team sync page (cherry picked from commit `60e6ff1038`) Co-authored-by: Isabel <76437239+imatwawana@users.noreply.github.com>	3 years ago
Emil Tullstedt	6604ea1fbb	Chore: Upgrade Go to 1.20.3 (#66840 ) Backport of #66264	3 years ago
Grot (@grafanabot)	fbbc5b4ff7	[v9.3.x] docs: add missing alias (#66674 ) docs: add missing alias (#66621) added missing alias (cherry picked from commit `2b7f41f4df`) Co-authored-by: Isabel <76437239+imatwawana@users.noreply.github.com>	3 years ago
Grot (@grafanabot)	208c3a0c2f	[v9.3.x] removed duplicate query data source section (#66680 ) removed duplicate query data source section (#66605) (cherry picked from commit `1e53b29eee`) Co-authored-by: lwandz13 <126723338+lwandz13@users.noreply.github.com>	3 years ago
Isabel	02cb3a0751	[v9.3.x]docs: update broken link (#66528 ) backport PR to fix broken link	3 years ago
Grot (@grafanabot)	23007843e1	[v9.3.x] Prometheus: Fix missing abs operation to query builder (#63461 ) Prometheus: Fix missing abs operation to query builder (#63139) Add abs operator to prometheus query builder (cherry picked from commit `80292d3d1e`) Co-authored-by: ismail simsek <ismailsimsek09@gmail.com>	3 years ago
Grot (@grafanabot)	5a35850514	[v9.3.x] Alerting: Update migration to put alerts to the default folder if dashboard folder is missing (#66592 ) * Alerting: Update migration to put alerts to the default folder if dashboard folder is missing (#65577) * extract function * use context logger * put alert to general folder if folder is missing * move folderHelper init * add test * Update pkg/services/sqlstore/migrations/ualert/ualert.go Co-authored-by: Matthew Jacobson <matthew.jacobson@grafana.com> --------- Co-authored-by: Matthew Jacobson <matthew.jacobson@grafana.com> (cherry picked from commit `7b2f44762e`) * rename ID to Id and dashboards.Dashboard to models.Dashboard --------- Co-authored-by: Yuri Tseretyan <yuriy.tseretyan@grafana.com>	3 years ago
Isabel	bf1d57d97c	[v9.3.x] docs: put the numbers before dashboard elements (#66610 ) resolving merge conflict for backport PR Co-authored-by: samu6851 <samuel.oswalt@grafana.com>	3 years ago
Dimitris Sotirakis	a807c04177	[v9.3.x] Chore: Upgrade Go to 1.20.1 and Alpine to 3.17 (#63891 ) (#66455 ) * CI: Split subcommand (#66005) * Update e2e package - Ensure health request is monitored for addDatasource flow - Add custom timeout to configurePanel flow (cherry picked from commit `155fcae4aa`) * Make health check optional (cherry picked from commit `91f66d61e1`) --------- Co-authored-by: Andreas Christou <andreas.christou@grafana.com>	3 years ago
Dimitris Sotirakis	b34f9779fd	[v9.3.x] CI: Split `/bin/build artifacts ` subcommand (#66005 ) (#66341 ) CI: Split `/bin/build artifacts ` subcommand (#66005) * Split go files * Modify publishartifacts.go * Split main * FIXME: Temp add GCSCopy to gcloud/storage * Fix lint * Exported flags * Update starlark - make drone * Further backend lint fixes * Add fallback_test.go * Fix go imports order * make drone * Remove GCSCopy from static assets * Remove GCSCopy from storybook * Fix lint * Remove GCSCopy * Remove success logline * drone yaml cleanup * Add artifacts-editions flag * Fix starlark * Add default sting slice in artifacts packages command (cherry picked from commit `24d348f804`) # Conflicts: # .drone.yml	3 years ago
Jack Baldry	fc88c0b597	[v9.3.x] Fix website build errors (#66116 ) * Fix reference to Grafana CLI - Make relref for relative permalink - Use relative path for unambiguous resolution Signed-off-by: Jack Baldry <jack.baldry@grafana.com> (cherry picked from commit `58edeeaba6`) * Remove reference to non-existent shared page Signed-off-by: Jack Baldry <jack.baldry@grafana.com> (cherry picked from commit `89af5b60f2`) * Fix reference to Grafana Cloud - Make relref for relative permalink - Use absolute resolution Signed-off-by: Jack Baldry <jack.baldry@grafana.com> * Fix reference to Alertmanager page Signed-off-by: Jack Baldry <jack.baldry@grafana.com> --------- Signed-off-by: Jack Baldry <jack.baldry@grafana.com>	3 years ago
Grot (@grafanabot)	e9a649bf8f	[v9.3.x] fixed broken links (#66177 ) fixed broken links (#66153) (cherry picked from commit `ce00465d9b`) Co-authored-by: lwandz13 <126723338+lwandz13@users.noreply.github.com>	3 years ago
Grot (@grafanabot)	4831e7c3e2	[v9.3.x] Docs: Small fixes for Template Variables Doc (#66137 ) Docs: Small fixes for Template Variables Doc (#65947) * Docs: Small fixes for Template Variables Doc * Docs: Minor fix to Variables Docs - Added missing word * Update docs/sources/dashboards/variables/add-template-variables/index.md Co-authored-by: Isabel <76437239+imatwawana@users.noreply.github.com> * empty commit to trigger linting * small change to trigger linting --------- Co-authored-by: Isabel <76437239+imatwawana@users.noreply.github.com> Co-authored-by: Isabel Matwawana <isabel.matwawana@grafana.com> (cherry picked from commit `3685dd56e1`) Co-authored-by: sarah-spang <86264026+sarah-spang@users.noreply.github.com>	3 years ago
Grot (@grafanabot)	ca388baef4	[v9.3.x] docs: fixes link (#66067 ) docs: fixes link (#66051) * fixes link * Update docs/sources/setup-grafana/configure-security/configure-authentication/enhanced-ldap/index.md Co-authored-by: melGL <81323402+melgl@users.noreply.github.com> --------- Co-authored-by: melGL <81323402+melgl@users.noreply.github.com> (cherry picked from commit `421b911c45`) Co-authored-by: Christopher Moyer <35463610+chri2547@users.noreply.github.com>	3 years ago
Christopher Moyer	e032e71b01	[v9.3] Docs: Added note to contact Support (#65235 ) (#65961 ) Docs: Added note to contact Support (#65235) * Added note to contact Support * Update docs/sources/setup-grafana/configure-security/configure-authentication/enhanced-ldap/index.md * Update docs/sources/setup-grafana/configure-security/configure-authentication/enhanced-ldap/index.md * makes prettier * Apply suggestions from code review --------- Co-authored-by: Christopher Moyer <35463610+chri2547@users.noreply.github.com> Co-authored-by: Chris Moyer <chris.moyer@grafana.com> (cherry picked from commit `445734888b`) Co-authored-by: melGL <81323402+melgl@users.noreply.github.com>	3 years ago
Grot (@grafanabot)	b7f4b61c4b	[v9.3.x] Docs: Updated Grafana OSS Introduction (#66023 ) Docs: Updated Grafana OSS Introduction (#66004) * Added Phlare and added static data sources to intro instead of it just being TSDB sources * Update docs/sources/introduction/_index.md Co-authored-by: Christopher Moyer <35463610+chri2547@users.noreply.github.com> * Update docs/sources/introduction/_index.md Co-authored-by: Christopher Moyer <35463610+chri2547@users.noreply.github.com> --------- Co-authored-by: Christopher Moyer <35463610+chri2547@users.noreply.github.com> (cherry picked from commit `e8813916c9`) Co-authored-by: Alex Close <alex.kirtley-close@grafana.com>	3 years ago
Grot (@grafanabot)	1d0c19ff5c	[v9.3.x] Build: Add CloudMode to build versions (#65988 ) Build: Add CloudMode to build versions (#65651) * Add CloudMode to build versions * Use linux-amd64 variant without musl for cloud mode * Add cloud mode to version folder on package upload * Use musl variant for CloudMode * Only sign rpm packages if there's any to sign * Remove trailing whitespace (cherry picked from commit `8f282b8a6e`) Co-authored-by: Guilherme Caulada <guilherme.caulada@grafana.com>	3 years ago
Dimitris Sotirakis	c9882623f5	[v9.3.x] Backport #65797 and #65806 to v9.3.x (#65856 ) * CI: Make `init-enterprise` depend on `grabpl` (#65797) Make init-enterprise depend on grabpl # Conflicts: # .drone.yml (cherry picked from commit `821633c796`) # Conflicts: # .drone.yml * CI: Exclude cloud related tags from tag events (#65806) * Exclude cloud related tags * Fix starlark lint errors (cherry picked from commit `a18ea77aac`) # Conflicts: # .drone.yml	3 years ago
Grot (@grafanabot)	1bf4a3e2b1	[v9.3.x] update enhanced-ldap (#65866 ) update enhanced-ldap (#65687) * update enhanced-ldap documenting a potential issue with ldap active sync, when search filter and username attributes do not match. * Update docs/sources/setup-grafana/configure-security/configure-authentication/enhanced-ldap/index.md * formats example * Update docs/sources/setup-grafana/configure-security/configure-authentication/enhanced-ldap/index.md --------- Co-authored-by: Christopher Moyer <35463610+chri2547@users.noreply.github.com> Co-authored-by: Chris Moyer <chris.moyer@grafana.com> (cherry picked from commit `99ac39f0d2`) Co-authored-by: annelaurefroment <49911675+annelaurefroment@users.noreply.github.com>	3 years ago
Grot (@grafanabot)	b0f55819a1	[v9.3.x] Docs: Add transformations doc link for What's New v9.2 (#65849 ) Docs: Add transformations doc link for What's New v9.2 (#65673) * Add transformations doc link Add transformations doc link to `Transformations: INNER JOINs` section. Related issue: https://github.com/grafana/grafana/issues/65671 * Apply suggestions from code review Co-authored-by: Isabel <76437239+imatwawana@users.noreply.github.com> --------- Co-authored-by: Christopher Moyer <35463610+chri2547@users.noreply.github.com> Co-authored-by: Isabel <76437239+imatwawana@users.noreply.github.com> (cherry picked from commit `b86c0bc4fa`) Co-authored-by: Christine Wang <wang.christiney@gmail.com>	3 years ago
Horst Gutmann	94cbd9dba2	[v9.3.x] CI: Move release integration pipeline to standalone promotion pipeline (#65787 ) (#65802 ) CI: Move release integration pipeline to standalone promotion pipeline (#65787) (cherry picked from commit `e9aef20eb4`)	3 years ago
Grot (@grafanabot)	87ca6d206d	[v9.3.x] Alerting: Fix integration test for creating silences (#65791 ) Alerting: Fix integration test for creating silences (#65722) * fix integration test for creating silences to create correct silence with endsAt in the future * Update api_alertmanager_test.go (cherry picked from commit `ed8628e39d`) Co-authored-by: Yuri Tseretyan <yuriy.tseretyan@grafana.com>	3 years ago
Grot (@grafanabot)	7e1690b5af	[v9.3.x] Docs: Fix markup for URL (#65648 ) Docs: Fix markup for URL (#65576) * Docs: Fix markup for URL * updates absolute URL to a relref --------- Co-authored-by: Chris Moyer <chris.moyer@grafana.com> (cherry picked from commit `940768cf76`) Co-authored-by: sarah-spang <86264026+sarah-spang@users.noreply.github.com>	3 years ago
Grot (@grafanabot)	0bf04f6095	[v9.3.x] Docs: Fix Nightly Builds URL (#65569 ) Docs: Fix Nightly Builds URL (#65552) Update _index.md URL for Nightly Builds leads to standard download page. - Updated to direct to correct Nightly Downloads page: https://grafana.com/grafana/download/nightly?edition=oss (cherry picked from commit `8717cd0761`) Co-authored-by: sarah-spang <86264026+sarah-spang@users.noreply.github.com>	3 years ago
Christopher Moyer	aeea456a0e	[v9.3]: Remove redundant content or delete this page entirely (#65446 ) (#65543 ) Remove redundant content or delete this page entirely (#65446) * Remove redundant content or delete this page entirely The top of the page has redundant content pitching Grafana Cloud. "You can also configure the MS SQL Server data source on a Grafana Cloud instance without having to host Grafana yourself." Which is directly under the highlighted area explaining the same thing. The same content is floating in the right side of all the pages as well. Removed "> Note: You must install Grafana 5.1+ in order to use the integrated MS SQL data source." Wait, why does this page exist if the data source page has the relevant updated content? https://grafana.com/docs/grafana/latest/datasources/mssql/ * makes prettier --------- Co-authored-by: Chris Moyer <chris.moyer@grafana.com> (cherry picked from commit `2b73f8cfd5`) Co-authored-by: mallettjared <110853992+mallettjared@users.noreply.github.com>	3 years ago
Grot (@grafanabot)	5441a02f94	[v9.3.x] configure HTTPS documentation (#65559 ) configure HTTPS documentation (#65271) * configure HTTPS settings for grafana * Apply suggestions from code review * Apply suggestions from code review * rewrites and restructures content * Apply suggestions from code review * PR feedback review; https docs * Update docs/sources/setup-grafana/set-up-https.md Co-authored-by: Christopher Moyer <35463610+chri2547@users.noreply.github.com> * Update docs/sources/setup-grafana/set-up-https.md Co-authored-by: Christopher Moyer <35463610+chri2547@users.noreply.github.com> * Update docs/sources/setup-grafana/set-up-https.md Co-authored-by: Christopher Moyer <35463610+chri2547@users.noreply.github.com> * Update docs/sources/setup-grafana/set-up-https.md Co-authored-by: Christopher Moyer <35463610+chri2547@users.noreply.github.com> * Update docs/sources/setup-grafana/set-up-https.md Co-authored-by: Christopher Moyer <35463610+chri2547@users.noreply.github.com> * Update docs/sources/setup-grafana/set-up-https.md Co-authored-by: Christopher Moyer <35463610+chri2547@users.noreply.github.com> * Update docs/sources/setup-grafana/set-up-https.md Co-authored-by: Christopher Moyer <35463610+chri2547@users.noreply.github.com> * errata * make prettier * Apply suggestions from code review --------- Co-authored-by: Christopher Moyer <35463610+chri2547@users.noreply.github.com> Co-authored-by: Chris Moyer <chris.moyer@grafana.com> (cherry picked from commit `4839f1543a`) Co-authored-by: David Allen <david.allen@grafana.com>	3 years ago
Horst Gutmann	64f074ca8d	[v9.3.x] CI: Update golangci-lint to 1.51.2 for Go 1.20 compatibility (#65506 ) [v9.3.x] Update golangci-lint to 1.51.2 for Go 1.20 compatibility	3 years ago
Grot (@grafanabot)	972a9c5957	[v9.3.x] docs: fix enhanced ldap alias (#65484 ) docs: fix enhanced ldap alias (#65478) fixed alias (cherry picked from commit `4b29b1d741`) Co-authored-by: Isabel <76437239+imatwawana@users.noreply.github.com>	3 years ago
Grot (@grafanabot)	3e2bdb3396	[v9.3.x] docs: update elasticsearch grafana play link (#65479 ) docs: update elasticsearch grafana play link (#65280) (cherry picked from commit `0d3e0e7cc4`) Co-authored-by: Isabel <76437239+imatwawana@users.noreply.github.com>	3 years ago
Grot (@grafanabot)	678847d250	[v9.3.x] CI: Allow overwriting of existing GitHub release assets (#65458 ) CI: Allow overwriting of existing GitHub release assets (#65127) * CI: Allow overwriting of existing GitHub release assets This closes #63698 * Use c for *cli.Context in publishgithub.go (cherry picked from commit `4ab3bd6f7e`) Co-authored-by: Horst Gutmann <horst.gutmann@grafana.com>	3 years ago
Grot (@grafanabot)	d6d924b62a	[v9.3.x] Update doc-validator to latest release (#62224 ) * Update doc-validator to latest release (#62170) * Update doc-validator to latest release Signed-off-by: Jack Baldry <jack.baldry@grafana.com> * Skip image validation Signed-off-by: Jack Baldry <jack.baldry@grafana.com> Signed-off-by: Jack Baldry <jack.baldry@grafana.com> (cherry picked from commit `f4be855e30`) * Chore: Move to node 18 again (#62079) move to node 18 again (cherry picked from commit `64352e8d08`) Signed-off-by: Jack Baldry <jack.baldry@grafana.com> --------- Co-authored-by: Jack Baldry <jack.baldry@grafana.com> Co-authored-by: Ashley Harrison <ashley.harrison@grafana.com>	3 years ago
Dimitris Sotirakis	4098978273	[v9.3.x] CI: Cleanup unnecessary `grabpl` dependencies (#65330 ) (#65346 ) CI: Cleanup unnecessary `grabpl` dependencies (#65330) * Remove unnecessary grabpl dependencies * Revert test-frontend change (cherry picked from commit `89d642e001`) # Conflicts: # .drone.yml	3 years ago
Virginia Cepeda	7847651f0c	Alerting: Improve showing nextEvaluationDate for rules (#65205 ) (#65223 ) * Improve showing nextEvaluationDate for rules Co-Authored-By: Konrad Lalik <konradlalik@gmail.com> * Improve imports and comments --------- Co-authored-by: Konrad Lalik <konradlalik@gmail.com> (cherry picked from commit `b90aed4fd7`)	3 years ago
Dimitris Sotirakis	dc6c3783f1	[v9.3.x] CI: Remove `grabpl` dependency from `publish-packages` steps (#65329 ) (#65332 ) CI: Remove `grabpl` dependency from `publish-packages` steps (#65329) Remove grabpl dependency from publish packages (cherry picked from commit `3b00d2c273`) # Conflicts: # .drone.yml	3 years ago
Grot (@grafanabot)	4d03b21958	[v9.3.x] Docs/updates amazon cloudwatch (#65281 ) Docs/updates amazon cloudwatch (#64987) * updated AWS to Amazon in the index file * edited query editor index file -AWS with Amazon (cherry picked from commit `0975e53fc0`) Co-authored-by: lwandz13 <126723338+lwandz13@users.noreply.github.com>	3 years ago
ismail simsek	138f2fef8d	[v9.3.x] Expressions: More robust expression check (#65230 ) * Expressions: More robust expression check (#65006) More robust expression check (cherry picked from commit `1328878ace`) * Fix import * Fix tests	3 years ago
Dimitris Sotirakis	91fe6eb1b7	[v9.3.x] CD: Remove `fetch-images` dependency from AWS marketplace automation (#65173 ) (#65194 ) CD: Remove `fetch-images` dependency from AWS marketplace automation (#65173) * Remove fetch-images dependency * Fix starlark link (cherry picked from commit `d0be9610f0`) # Conflicts: # .drone.yml	3 years ago
Grot (@grafanabot)	b98d0cf461	Release: Bump version to 9.3.12 (#65207 ) "Release: Updated versions in package to 9.3.12"	3 years ago
Horst Gutmann	dc2f72da0a	[v9.3.x] Changelog: Updated changelog for 9.3.11 (#65204 ) (#65206 ) Changelog: Updated changelog for 9.3.11 (#65204) (cherry picked from commit `f0c716a447`) Co-authored-by: Grot (@grafanabot) <43478413+grafanabot@users.noreply.github.com>	3 years ago
ismail simsek	3ac7f32ace	[v9.3.x] Fix xss in Graphite functions tooltip (#806 ) Fix xss in Graphite functions tooltip (#804) (cherry picked from commit 87aad3f11836f810ee1fdfee27827e746ef36055) Co-authored-by: Ludovic Viaud <ludovic.viaud@gmail.com>	3 years ago
Konrad Lalik	fa21dba89e	Alerting: Fix notification policies matcher filter (#64967 ) (#65031 ) (cherry picked from commit `bf3422740b`)	3 years ago
Dimitris Sotirakis	30ef59ec6c	[v9.3.x] CI: Update `grabpl` to `3.0.30` (#65028 ) (#65090 ) CI: Update `grabpl` to `3.0.30` (#65028) Update grabpl (cherry picked from commit `4a80233bed`) # Conflicts: # .drone.yml # scripts/drone/steps/lib.star	3 years ago
Horst Gutmann	2b971a4167	Update CODEOWNERship for grafana-delivery team (#64973 ) (#65019 ) (cherry picked from commit `2897ee37bf`)	3 years ago
Grot (@grafanabot)	9a4c18c02a	[v9.3.x] Table Panel: Fix image of image cell overflowing table cell when a data link is added. (#61617 ) Table Panel: Fix image of image cell overflowing table cell when a data link is added. (#59392) * TablePanel: fix image of image cell overflowing table cell when a data link is added * Fix image cell and gauge panel in respective places instead (cherry picked from commit `004705a10b`) Co-authored-by: Oscar Kilhed <oscar.kilhed@grafana.com>	3 years ago
ismail simsek	4399288f9d	[v9.3.x] Alerting: Rule viewer expression view fix (#65007 ) Fix rule viewer	3 years ago

1 2 3 4 5 ...

39455 Commits (a9873db0f94dea418511ecc953bc3d304ab95e3f) All Branches Search

39455 Commits (a9873db0f94dea418511ecc953bc3d304ab95e3f)

All Branches