IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2026-09-05 04:40:13 -05:00
Code Issues Packages Projects Releases Wiki Activity
23,320 Commits 892 Branches 731 Tags
79c0fa4ca5acb979c054cd78e99a92ecff0e5301
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Leonard Gram 65bacf2df6 CI: fix release script remove filtering (#20552) 2019-11-21 11:32:25 +01:00
Leonard Gram d630ac4b68 CI: Build all platforms for Enterprise (#20389) 
* CI: Build all platforms for Enterprise

* CI: publishes new enterprise builds to grafana.com
 2019-11-21 09:41:32 +01:00
Leonard Gram e9668fd251 LDAP: last org admin can login but wont be removed (#20326) 
* LDAP: last org admin (that's going to be removed) can login
Previously, if you tried to login with LDAP but were that last org admin
of an org that you would no longer be an admin of after sync (which
happens at login), you wouldn't be able to login due to an error.
 2019-11-13 15:39:15 +01:00
Leonard Gram 2850419470 Build: adds make target run-frontend (#20227) 
Adds a target that will run yarn install if needed and then build and start watching for changes.
 2019-11-12 11:08:40 +01:00
Leonard Gram 30775a3f49 Build: adds the pkg/errors dependency that was missing from go.mod (#20143) 
This dependency was added a while back and exists in the vendor
directory but was never properly added to go.mod.
 2019-11-01 16:54:44 +01:00
Leonard Gramandgotjosh 730bedf36f LDAP Debug: No longer shows incorrectly matching groups based on role (#20018) 
* LDAP Debug: No longer shows incorrectly matching groups based on role

Org Role was used as a shortcut to figure out what groups were matching
and which weren't. That lead to too all groups matching a specific role
to show up for a user if that user got that role.

* LDAP Debug: Fixes ordering of matches

The order of groups in the ldap.toml file is important, only the first
match for an organisation will be used. This means we have to iterate
based on the config and stop matching when a match is found.

We might want to think about showing further matches as potential
matches that are shadowed by the first match. That would possibly make
it easier to understand why one match is used instead of another one.

* LDAP Debug: never display more than one match for the same LDAP group/mapping.

* LDAP Debug: show all matches, even if they aren't used

* Update public/app/features/admin/ldap/LdapUserGroups.tsx

Co-Authored-By: gotjosh <josue.abreu@gmail.com>

* Update public/app/features/admin/ldap/LdapUserGroups.tsx

Co-Authored-By: gotjosh <josue.abreu@gmail.com>
 2019-11-01 15:42:22 +01:00
Leonard Gram 992b4b8adf Licensing service (#19903) 
* Licensing: supplies a service to handle licensing information

* Licensing: uses the license service further

Uses the license service instead of settings.isEnterprise:
- external team members
- saml
- usage stats

* Licensing: fixes broken tests due to new Licensing service dependency

* Licensing: fixes linting errors

* Licensing: exposes license expiry information to the frontend
 2019-11-01 14:56:12 +01:00
Leonard Gram e940edc79f Docker: makes it possible to parse timezones in the docker image (#20081) 2019-10-30 09:33:27 +01:00
Leonard Gram 7daa660584 docs: improved setup instructions for reporting (#19935) 2019-10-22 09:38:28 +02:00
Leonard Gram f9b2204514 Docs: reports feature (#19472) 
* Docs: Reporting
 2019-10-01 09:16:07 +01:00
Leonard Gram dd794625dd API: adds redirect helper to simplify http redirects (#19180) 2019-09-17 19:28:35 +02:00
Leonard Gram cdad1331d9 CI: no longer using grafana-master... package. (#18884) 2019-09-04 11:30:26 +02:00
Leonard Gram dd2068067c CI: stop deployment to s3 (#18831) 2019-09-03 11:01:36 +02:00
Leonard Gram 3481caf4fd Docs: changelog for docker 6.3 (#18429) 2019-08-07 11:12:57 +02:00
Leonard Gram 48d436ea6d Docs: Changelog 6.3.0 beta4 (#18359) 
* Changelog: v6.3.0-beta3

* Changelog: 6.3.0-beta4
 2019-08-03 16:51:55 +02:00
Leonard Gram dc52b7df55 Docs: updated latest.json (#18363) 2019-08-02 18:50:28 +02:00
Leonard Gram c675449aa2 cli: fix for recognizing when in dev mode. (#18334) 2019-08-02 09:38:41 +02:00
Leonard Gram e22269f7d3 v6.3.0-beta2 is latest testing (#18283) 2019-07-26 18:45:17 +02:00
Leonard Gram 1bd1945eb5 Release: Changelog update with v6.3.0-beta2 (#18281) 2019-07-26 17:46:11 +02:00
Leonard Gram 14fb23f5a2 docs: team sync (#18239) 
* docs: team sync

* docs: update team sync with regards to auth proxy

* Add a footnote on server-side session cache

* Docs: minor edits.
 2019-07-26 11:22:27 +02:00
Leonard Gram 2014549fa5 PhantomJS: Fixes rendering on Debian Buster (#18162) 
Closes #17588
 2019-07-20 13:03:10 +02:00
Leonard Gram 5d3a60d46e LDAP: Adds bind before searching LDAP for non-login cases. (#18023) 2019-07-10 12:25:21 +02:00
Leonard Gram 25506829be LDAP: Adds back support for single bind. (#17999) 2019-07-09 14:12:17 +02:00
Leonard Gram b67905a963 Auth: saml enabled check. (#17960) 2019-07-05 16:39:52 +02:00
Leonard Gram e574147b1e Auth: SAML login button. (#17932) 
* Auth: SAML login button.

* Fixed ts issue
 2019-07-05 15:24:52 +02:00
Leonard Gram 2596974cd2 Build: fixes missing shebang in release tagging script. (#17894) 2019-07-03 16:00:34 +02:00
Leonard Gram 8f150c67aa Docs upgrading deps (#17657) 
* Docs: correct link to the Grafana build-container.

* Docs: documents usage on the gopath when upgrading deps.

* Dev docs: info for upgrading deps only in one location.
 2019-07-02 09:43:25 +02:00
Leonard Gram d71043609e Testing: Include BatchRevoke for all tokens in the fake. (#17728) 2019-07-02 09:42:35 +02:00
Leonard Gram 8493965d31 Devenv: makes the grafana users default for saml. (#17782) 2019-06-26 16:10:45 +01:00
Leonard Gram 4c97d26102 Docs: clarified usage of go get and go mod (#17637) 2019-06-24 18:29:57 +02:00
Leonard Gram 37e9988e95 ldap: makes mocks available for testing. (#17576) 
* ldap: makes mocks available for testing.
 2019-06-14 09:54:19 +02:00
Leonard Gram 6baba64935 build: Fixed incorrect permissions for repo folders in ci-deploy. (#16360) 2019-04-03 15:24:34 +02:00
Leonard Gram 9b393d8f64 build: fixes bug in verification script. 2019-04-03 12:12:43 +02:00
Leonard Gram 4e547980fb build: Script to check that our repos work and what the latest package version is (#16350) 
* build: Easy version check of deb & rpm repos
 2019-04-03 08:51:43 +02:00
Leonard Gram b48c18a1c5 build: Fix for renamed package for armv6. 2019-04-02 13:37:57 +02:00
Leonard Gram 8dfa1f4c12 build: fixes publishing version. 2019-03-25 15:01:45 +01:00
Leonard Gram cf7a5b552b build: makes sure grafana.version is available when deploying. 2019-03-25 11:40:56 +01:00
Leonard Gram f0c6a480cd build: refactoring 2019-03-25 09:48:45 +01:00
Leonard Gram 768c7b6f4a build: updated build container with support for rpi1. 2019-03-25 09:48:45 +01:00
Leonard Gram ff977331f4 build: support for publishing armv6. 2019-03-25 09:48:45 +01:00
Leonard Gram 6e802dc94d build: builds armv6 with rpi1 compat gcc. 2019-03-25 09:48:45 +01:00
Leonard Gram f2b06a89f2 Merge pull request #15977 from grafana/admin-on-create-poc 
Editors becomes admin when creating dashboards, folders & teams
 2019-03-19 15:02:52 +01:00
Leonard Gram 95f7a91328 Merge pull request #16069 from xlson/ci-deploy-speedup 
build: crcmod speedups rsync to gcp for deploy.
 2019-03-19 14:13:15 +01:00
Leonard Gram 2ca8d17874 Merge pull request #16071 from xlson/include-build-container 
build: migrates the build container into the main repo.
 2019-03-19 14:10:02 +01:00
Leonard Gram 978c20a604 teams: explains the external property of a team membership. 2019-03-19 14:01:22 +01:00
Leonard Gram a615b78f8a permissions: removes global access to bus from MakeUserAdmin. 2019-03-19 14:01:20 +01:00
Leonard Gram adf0390b2c teams: local access to bus, moving away from dep on global. 2019-03-19 14:01:20 +01:00
Leonard Gram 6589a4e55f teams: better names for api permissions. 2019-03-19 14:01:20 +01:00
Leonard Gram 9f33f00343 teams: refactor. 2019-03-19 14:01:19 +01:00
Leonard Gram 9f8e43916d permissions: refactor. 2019-03-19 14:01:19 +01:00
Leonard Gram b796027bc6 teams: refactor. 2019-03-19 14:01:19 +01:00
Leonard Gram d1481cac50 teams: refactored db code. 2019-03-19 14:01:18 +01:00
Leonard Gram 3f57a81c47 teams: cleanup. 2019-03-19 14:01:16 +01:00
Leonard Gram ccfd6789ca teams: cleanup. 2019-03-19 14:01:16 +01:00
Leonard Gram fc0461134f dashboards: simplified code. 2019-03-19 14:01:15 +01:00
Leonard Gram c420af16b1 teams: editor/viewer team admin cant remove the last admin. 2019-03-19 14:01:14 +01:00
Leonard Gram c823ad5de7 team: uses PermissionType instead of int64 for permissions. 2019-03-19 14:01:13 +01:00
Leonard Gram 21d3d27452 teams: editors can't remove the last admin from a team. 2019-03-19 14:01:13 +01:00
Leonard Gram 8593668ab2 teams: tests use the new message for modifying team members. 2019-03-19 14:01:12 +01:00
Leonard Gram b783fa7039 team: renames teams.CanUpdate teamguardian.CanAdmin 2019-03-19 14:01:12 +01:00
Leonard Gram a6a3d698da teams: cleanup. 2019-03-19 13:57:30 +01:00
Leonard Gram 0b209de5d1 dashboard: only admin permission added to dashboard in folder. 2019-03-19 13:57:30 +01:00
Leonard Gram d593ffe3c1 dashboards: better error handling 2019-03-19 13:57:30 +01:00
Leonard Gram 89d4db8eb6 teams: team listing shows only your teams (editors). 2019-03-19 13:57:29 +01:00
Leonard Gram 1f949e58e1 teams: teams guard on all teams update methods. 2019-03-19 13:57:29 +01:00
Leonard Gram 23231e6d51 teams: added delete team guard 2019-03-19 13:57:29 +01:00
Leonard Gram 8e7a8282c1 teams: removed feature toggle as it is already in middleware 2019-03-19 13:57:28 +01:00
Leonard Gram d668550aa2 teams: added feature toggle and refactor tests 2019-03-19 13:57:28 +01:00
Leonard Gram 0d61f89577 teams: cleanup. 2019-03-19 13:57:28 +01:00
Leonard Gram 3be1d71f1f teams: test refactorings. 2019-03-19 13:57:27 +01:00
Leonard Gram 319879cfa8 teams: bugfix, user pointer. 2019-03-19 13:57:27 +01:00
Leonard Gram 90e9fda90c teams: start of team update guardian for editors 2019-03-19 13:57:26 +01:00
Leonard Gram aedc478208 teams: test for update team member. 2019-03-19 13:57:24 +01:00
Leonard Gram 2a88052c14 teams: can update team members permission. 2019-03-19 13:57:23 +01:00
Leonard Gram af4994ba16 teams: editor added as admin for created teams. 2019-03-19 13:57:22 +01:00
Leonard Gram 22e098b830 teams: editors can work with teams. 2019-03-19 13:57:22 +01:00
Leonard Gram da3dcd1918 folder: uses service to make user admin of created folder. 2019-03-19 13:57:21 +01:00
Leonard Gram c8c004095c permissions: broken out func for making creator admin. 2019-03-19 13:57:21 +01:00
Leonard Gram e174f7c20b folders: admin for created folders 2019-03-19 13:57:20 +01:00
Leonard Gram e294252e92 dashboards: user automatically becomes admin for created dashboards 2019-03-19 13:57:20 +01:00
Leonard Gram 4dceb60d20 build: migrates the build container into the main repo. 2019-03-19 11:34:01 +01:00
Leonard Gram 4152e5c16c build: updated deploy container with crcmod. 2019-03-19 10:57:17 +01:00
Leonard Gram 39e75d75b4 build: crcmod speedups rsync to gcp for deploy. 2019-03-19 10:48:41 +01:00
Leonard Gramandbergquist 6673915f2e Update style_guides/backend.md 
Co-Authored-By: bergquist <carl@grafana.com>
 2019-03-19 08:16:19 +01:00
Leonard Gram 1e52a1f9a5 Merge pull request #15539 from grafana/repo-recreation-documentation 
docs: howto for recreating our debian repositories.
 2019-03-05 07:18:39 +01:00
Leonard Gram 818ccb572e devenv: fixes incorrect influxdb config. 
[skip ci]
 2019-03-04 11:23:33 +01:00
Leonard Gram 1bcaaccb96 docs: missing field added to example 
Closes #15715
 2019-03-01 16:07:34 +01:00
Leonard Gram 36788183d8 service: fix for disabled internal metrics. 
Update of the internal metrics for Grafana was
disabled by mistake when refactoring the code.

Fixes #15651
 2019-02-26 11:41:55 +01:00
Leonard Gram c04395ce3a docs: 6.0 whats new 2019-02-25 19:25:47 +01:00
Leonard Gram 3c3e06515e Updated latest.json with 6.0 2019-02-25 17:09:49 +01:00
Leonard Gram e1d27bd79a Update CHANGELOG.md 2019-02-25 16:24:02 +01:00
Leonard Gram cab90ef4f9 Merge pull request #15640 from xlson/docs-6.0-released 
docs: grafana 6.0 has been released.
 2019-02-25 16:19:13 +01:00
Leonard Gram 38a116d0f7 docs: grafana 6.0 has been released. 2019-02-25 15:45:35 +01:00
Leonard Gram 26dcabc2dc Update CHANGELOG.md 2019-02-25 13:00:18 +01:00
Leonard Gram ccc97ed649 Merge pull request #15634 from grafana/15621-series-overrides 
graph: fixes click after scroll in series override menu
 2019-02-25 12:50:06 +01:00
Leonard Gram 5ff44bdbcf Merge pull request #15616 from grafana/fixed-variable-dropdown-update 
Fixed value dropdown not updating when it's current value updates
 2019-02-25 09:39:28 +01:00
Leonard Gram dc155dfa2f docs: howto for recreating our debian repositories. 2019-02-19 16:52:47 +01:00
Leonard Gram 4df78fe7ac Update CHANGELOG.md 2019-02-19 10:47:57 +01:00
Leonard Gram a9748f460e Update CHANGELOG.md 2019-02-19 10:46:51 +01:00
Leonard Gram 99205d5d9a Update CHANGELOG.md 2019-02-19 10:40:54 +01:00