IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2026-07-29 15:59:50 -05:00
Code Issues Packages Projects Releases Wiki Activity
25,993 Commits 1,119 Branches 715 Tags
bf5d52c5c7b1fff2546c74b0570d47c349355ea7
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Leonard GramandDiana Payton d17ba95492 Docs: logging in the docker container (#26119) 
* Docs: logging in the docker container

* Docs: wording

* Update docs/sources/installation/configure-docker.md

Co-authored-by: Diana Payton <52059945+oddlittlebird@users.noreply.github.com>
 2020-07-27 10:06:00 +02:00
Leonard Gram e6a027d905 update latest to 7.1.1 (#26588) 2020-07-24 16:21:44 +02:00
Leonard Gram 3ed1c14237 changelog 7.1.1 (#26586) 2020-07-24 16:17:31 +02:00
Leonard Gram 632c54f91d Docs: monthly reports (#25964) 
* Docs: monthly reports

* Docs: version available

* Docs: feedback from Diana and Agnes.
 2020-07-06 13:49:35 +02:00
Leonard GramEmil TullstedtAgnès Toulet
 		c066c6047e Docs: adds SAML and Okta to What's new in 7.0 (#24629) 
* Docs: adds SAML and Octa to What's new in 7.0

* Update docs/sources/guides/whats-new-in-v7-0.md

Co-authored-by: Emil Tullstedt <emil.tullstedt@grafana.com>

* Update docs/sources/guides/whats-new-in-v7-0.md

Co-authored-by: Agnès Toulet <35176601+AgnesToulet@users.noreply.github.com>

* Docs: review fixes

* Docs: review feedback

Co-authored-by: Emil Tullstedt <emil.tullstedt@grafana.com>
Co-authored-by: Agnès Toulet <35176601+AgnesToulet@users.noreply.github.com>
 2020-05-14 10:47:24 +02:00
Leonard Gram de8c1b9ad7 Reporting: tzdata is needed for reporting (#24422) 2020-05-08 14:17:12 +02:00
Leonard Gram e8341a09b2 Docs: make sure we always use the latest docs image (#24217) 2020-05-04 11:15:51 +02:00
Leonard Gram 4645167421 Devenv: add remote renderer to grafana (#24050) 2020-04-29 15:16:37 +02:00
Leonard Gram a7fa0e45eb changelog enterprise 7.0.0-beta1 (#24039) 2020-04-29 13:10:22 +02:00
Leonard Gram 7a7dca232c Devenv: ignore enterprise (#24037) 2020-04-29 10:57:29 +02:00
Leonard Gram c081513a96 Devenv: fix prometheus scrape ips (#23850) 
* Devenv: fix prometheus scrape ips

* Devenv: fix grafana in devenv reference

* Devenv: fixes prom random data reference
 2020-04-24 13:23:49 +02:00
Leonard Gram ebdbb0c96d Rendering: makes sure IsAvailable can be used during init of other services (#23817) 
* Rendering: makes sure service knows if it is configured after Init()

* Rendering: refactor
 2020-04-23 14:44:52 +02:00
Leonard Gram 8620b7c2aa Search: raise service init prio (#23740) 2020-04-21 15:30:09 +02:00
Leonard Gram f997f85eb7 CI: scan master and release images oss/enterprise (#23475) 2020-04-15 12:07:49 +02:00
Leonard Gram a49d619874 Devenv: prom 1.7.6 (#23321) 2020-04-03 16:12:03 +02:00
Leonard Gram 186e85035e update latest to 6.7.1 (#22933) 2020-03-20 17:32:11 +01:00
Leonard Gram 66e1111948 changelog 6.7.1 (#22932) 2020-03-20 17:23:22 +01:00
Leonard Gram 65dbd7cadc CI: failfast for verify-repos.sh (#22902) 
* CI: failfast for verify-repos.sh

* shellcheck
 2020-03-19 17:53:55 +01:00
Leonard Gram 229f135e5c Devenv: adds grafana block with a customizeable version (#22867) 
The grafana block is pre-configured with the devenv datasources and
dashboards and will work with any other blocks out of the box.
 2020-03-18 15:42:41 +01:00
Leonard Gram aeab27c34c Changelog: adds missing enterprise features (#22399) 
* Changelog: adds missing enterprise features

* wording
 2020-02-24 16:50:09 +01:00
Leonard Gram d5a2bc1a54 CI: check ubuntu and alpine images with trivy (#22314) 
* CI: check ubuntu and alpine images with trivy

* CI: clear trivy cache before running
 2020-02-19 16:10:22 +01:00
Leonard Gram 10fbabfb2e Sqlstore: guard against getting a dashboard without specifying identi… (#22246) 
* Sqlstore: guard against getting a dashboard without specifying identifier

* Sqlstore: linting
 2020-02-17 15:32:20 +01:00
Leonard Gram 7dcf5887e6 Docker: Publish enterprise image with master-commit tag (#22008) 2020-02-07 16:08:14 +01:00
Leonard Gram 59530e4758 Quota: Makes sure we provide the request context to the quota service (#21949) 
It was missing for ldap_login which means that the first signup failed
for users with LDAP+quota enabled. There's also potential cases where we
can't provide a request context (background jobs) which is also covered,
but needs a refactoring.
 2020-02-06 08:49:58 +02:00
Leonard Gram 5345868148 Docker: change plugin path in custom docker (#21837) 
This is to make the custom dockerfiles compatible with our instruction
to use persitent volumes for the /var/lib/grafana dir. Without this
change the contents of that folder will be overshadowed by the persitent
volume and none of the pre-installed plugins will be available.
 2020-01-30 11:17:41 -08:00
Leonard Gram 20e96a9241 MSI: License for Enterprise (#21794) 2020-01-28 16:18:00 +01:00
Leonard Gram 00fa30f243 6.6.0 latest (#21762) 2020-01-27 15:35:35 +01:00
Leonard Gram 90f552b6b6 Docs: Enterprise 6.6 (#21666) 
* Docs: gitlab team-sync documented correctly

* docs: initial docs for whitelabeling

* Docs: enterprise repositories

* Docs: rpm enterprise install

* Docs: re-structured the rpm install page to be more similar to the deb page

* Docs: responded to review feedback

* Docs: recommends the enterprise edition

* Update docs/sources/installation/debian.md
 2020-01-24 16:33:59 +01:00
Leonard Gram 4a1f993fd1 next version 6.7.0 (#21617) 
* next version 6.7.0

* updates grafana/toolkit and co

* Verison: manually fixed version
 2020-01-21 15:15:38 +01:00
Leonard Gram e8be2bbbec latest.jso: Update latest beta 6.6.0-beta1 (#21623) 2020-01-21 15:14:03 +01:00
Leonard GramandSofia Papagiannaki 07d96fe486 Changelog: v6.6.0-beta1 (#21619) 
* Changelod: v6.6.0-beta1

* Changelog: grafana/ui v6.6.0-beta.1.0

* Changelog: moved toolkit to its own file

* Changelog: fix version

* Remove closed PR

Co-authored-by: Sofia Papagiannaki <papagian@users.noreply.github.com>
 2020-01-21 10:10:16 +01:00
Leonard Gram 7e0890d57d Build: adds missing filters required to build oss msi (#21618) 2020-01-20 14:37:34 +01:00
Leonard Gram b2c235c46d Build: enables deployment of enterprise msi (#21607) 2020-01-20 09:26:27 +01:00
Leonard Gram cc2586d250 CI: MSI for Enterprise (#21569) 
* CI: ee msi build

* shellcheck

* Fake it so that we get a ee msi build on pull request runs

* fix error in prep job

* save msi for testing

* get enterprise zip

* Fixes to version and hash detection.

* Removes ci test code
 2020-01-20 08:35:45 +01:00
Leonard Gram 72023d90bd CI: Revert msi build (#21561) 
* Revert "CI: adds missing files for ee msi (#21559)"

This reverts commit 6e412d88c9.

* Revert "CI: Enterprise MSI (#21518)"

This reverts commit d910f69b2c.
 2020-01-17 12:10:29 +01:00
Leonard Gram 6e412d88c9 CI: adds missing files for ee msi (#21559) 2020-01-17 12:06:08 +01:00
Leonard Gram d910f69b2c CI: Enterprise MSI (#21518) 
* build: builds msi for enterprise

* build: renamed msi generator directory

* build: build and deploy enterprise msi

* Build: placeholder license file for enterprise

* Build: correct name for ee msi
 2020-01-17 11:33:43 +01:00
Leonard Gram 673ccdc448 Settings: Env override support for dynamic settings (#21439) 
* Settings: supports env overrrides for dynamic settings

* Settings: makes it possible to explicitly get env override support for dynamic settings

* Make linter happy
 2020-01-10 15:33:54 +01:00
Leonard GramDiana PaytonArve Knudsen
 		d22e53bba8 Docs: explain how to setup the apt repo without helpers (#21194) 
* Docs: explain how to setup the apt repo without helpers

* Docs: re-structured apt install docs

* Update docs/sources/installation/debian.md

Co-Authored-By: Diana Payton <52059945+oddlittlebird@users.noreply.github.com>

* Update docs/sources/installation/debian.md

Co-Authored-By: Diana Payton <52059945+oddlittlebird@users.noreply.github.com>

* Docs: improvements based on feedback

* Docs: appending is safer if the user for some reason wants both beta and non beta

* Docs: repo -> repository

* Update docs/sources/installation/debian.md

Co-Authored-By: Arve Knudsen <arve.knudsen@gmail.com>

* Update docs/sources/installation/debian.md

Co-Authored-By: Arve Knudsen <arve.knudsen@gmail.com>

Co-authored-by: Diana Payton <52059945+oddlittlebird@users.noreply.github.com>
Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>
 2020-01-08 10:38:31 +01:00
Leonard Gram 1c71637d11 Build: package all binaries for enterprise (#21381) 2020-01-07 16:00:58 +01:00
Leonard Gram f33a917af2 Docs: fix ordering of apt setup (#21192) 2019-12-19 15:48:16 +01:00
Leonard GramandDiana Payton 15547290c1 docs: rendering plugin required for reporting (#21162) 
* docs: rendering plugin required for reporting

* Update docs/sources/features/reporting.md

Co-Authored-By: Diana Payton <52059945+oddlittlebird@users.noreply.github.com>
 2019-12-19 14:55:18 +01:00
Leonard Gram ff422be961 docs: always updates docker image before building docs site (#21165) 2019-12-18 13:26:47 +01:00
Leonard Gram 67d83d1ffc build: adds IANA timezone info to windows build (#21001) 2019-12-10 16:00:37 +01:00
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