public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
44,332 Commits 655 Branches 650 Tags
659a01903e3bf6963da17029cd2b4304f5554bd7
Commit Graph
5628 Commits
Author SHA1 Message Date
bergquist d62d5c7418 provisioning: delete dashboards from db when file is missing 2018-01-25 15:25:07 +01:00
Daniel Lee bc5fae5367 dashfolders: merge conflict 2018-01-25 14:54:50 +01:00
Leonard Gram 1c034b7a73 fixes minor typo 2018-01-25 09:30:37 +01:00
bergquist c3a768b3ed provsioning: dont stop grafana due to missing 2018-01-25 09:30:37 +01:00
bergquist 57e7048b8f provisioning: enables title changes for dashboards 2018-01-24 19:16:57 +01:00
Marcus Efraimsson d36fd66dba dashfolder: fix for sqlite test 2018-01-24 11:43:08 +01:00
Daniel Lee 9d2a667e8b dashfolder: fix for mysql test 2018-01-24 11:19:26 +01:00
bergquist ee973a977b stats: send amount of stars as stats 2018-01-23 22:51:05 +01:00
bergquist ea988a37dd tech: avoid using deprecated functions 2018-01-23 22:30:45 +01:00
bergquist 5a1cf2c793 style: minor code style changes 2018-01-23 22:28:47 +01:00
bergquist 77a4ccb822 dashboards: save provisioning meta data 2018-01-23 21:54:30 +01:00
bergquist 67a9e6a71d provisioing: add lookup table provisioned dashboards 2018-01-23 21:52:55 +01:00
bkaganyildiz 97d969bd5c Update OpsGenie Notifier to support different api domains. 2018-01-22 22:27:35 +03:00
Daniel Lee 94a54248c1 dashfolders: show folders use can save to in picker 
Instead of returning all folders a user has some sort of access to,
this change creates a new end point that returns folders the user
has write access to. This new endpoint is used in the folder picker
 2018-01-20 01:58:28 +01:00
bergquist 083abff297 Merge branch 'master' into provisioning 
* master:
  install dep instead of govendor on setup
  remove unused code from vendor
  migrate from govendor to dep
  fix: cloudwatch corrected error handling so original error is not thrown away
  Generic Oauth Support for ADFS (#9242)
  Adjusted the border color on the buttons in dashboard nav, fixed alert email text area width, fixed padding-top issue on dashboard settings aside
  mysql: convert numbers to text for annotation tooltip
  mysql: update to use ColumnTypes interface in new version
  mysql: update mysql driver to latest master
  gofmt my dear friend
  ux: updated react-layout-grid
 2018-01-19 10:36:02 +01:00
Matt 0dffb6dbb1 Adjusted the border color on the buttons in dashboard nav, fixed alert email text area width, fixed padding-top issue on dashboard settings aside 2018-01-18 14:40:08 +01:00
Daniel Lee f64637c2c5 dashfolders: stop user locking themselves out of a folder 2018-01-18 14:30:04 +01:00
bergquist 7858965117 codestyle: extract code into methods 2018-01-18 12:04:12 +01:00
Carl Bergquist d6667c4fa0 Merge pull request #10548 from StevenTobin/follow_symlinks 
Make file_reader follow symlinks
 2018-01-18 11:29:34 +01:00
stobin f1813ae3a3 Make file_reader follow symlinks 2018-01-17 14:51:17 +00:00
bergquist 34d7f8a44f dashboards as cfg: property path replaces folder 2018-01-17 15:48:24 +01:00
Leonard Gram 183507964c Clearer naming for dashboard provisioning config. 
Renames folder (in options) to path to make it
different from the grafana folder wherein the
dashboard will be created.
 2018-01-16 17:40:14 +01:00
Daniel Lee a5830c6dbc Merge remote-tracking branch 'upstream/master' into dashboard_permissions 2018-01-16 12:02:13 +01:00
bergquist 1a6c2ea8d8 dashboards as cfg: logs error when trying to import dashboard with id 
dashboard json cannot contain fixed id when importing from
disk. We used to override this but it didnt caught all problems
so now we block dashboards from beeing imported instead.

closes #10504
 2018-01-15 12:26:43 +01:00
Robin Burchell 43109dc8ca telegram: Send notifications with an inline image 
If image upload is enabled, but there is no public image repository,
fall back to sending an image via telegram's API.
 2018-01-11 17:23:50 -05:00
Robin Burchell b6fcf2b609 telegram: Switch to using multipart form rather than JSON as a body 
This is a pre-requisite for uploading inline images.
 2018-01-11 17:21:43 -05:00
Robin Burchell a1a9f339bf telegram: Fix a typo in variable name 2018-01-11 17:21:43 -05:00
Daniel Lee 3ae1bf0c16 dashfolders: permissions for saving annotations 
ref #10275 Use folder permissions instead of hard coded
permissions on the annotations routes.
 2018-01-09 14:44:36 +01:00
Torkel Ödegaard c42a232644 Merge branch 'react-mobx' 2018-01-04 09:12:57 +01:00
Ali de22e793d8 Merge branch 'master' into master 2018-01-03 10:33:54 +03:00
Torkel Ödegaard 029317ed18 tech: alert list react migration progress 2017-12-31 14:16:19 +01:00
bergquist f5e00e133b dashboards as cfg: moves dashcash into its own file 2017-12-28 13:37:02 +01:00
bergquist 237d469ed4 dashboards as cfg: create dashboard folders if missing 
closes #10259
 2017-12-28 13:33:11 +01:00
bergquist f4078e1935 tests: for skipping with hidden folders 2017-12-27 15:04:49 +01:00
Torkel Ödegaard 3e7420320c Merge branch 'master' into react-mobx 2017-12-26 13:53:39 +01:00
bergquist 7917efb31a pagerduty: fixes invalid default value 
autoResolve incident checkbox was set to disabled by default but
the backend used enabled as default. This commit makes both use
disabled by defualt

fixes #10222
 2017-12-22 10:54:48 +01:00
bergquist e480a38dc1 pagerduty: adds test for reading auto resolve setting 2017-12-22 09:58:37 +01:00
Torkel Ödegaard 4181602b78 react: progress on react containers and mobx-state-tree store 2017-12-21 11:56:45 +01:00
Marcus Efraimsson af34f9977e Add avatar to team and team members page (#10305) 
* teams: add db migration for email column in teams table

* teams: /teams should render index page with a 200 OK

* teams: additional backend functionality for team and team members

Possibility to save/update email for teams.
Possibility to retrive avatar url when searching for teams.
Possibility to retrive avatar url when searching for team members.

* teams: display team avatar and team member avatars

Possibility to save and update email for a team

* teams: create team on separate page instead of modal dialog
 2017-12-20 21:20:12 +01:00
Marcus Efraimsson df3655dd4a db: fix postgres regression when comparing boolean columns/values (#10303) 
Use the dialect specific BooleanStr when comparing boolean columns/values.
Fixes #10300
 2017-12-20 12:15:49 +01:00
Carl Bergquist e2be6a38c4 pushover: update default message 2017-12-19 14:31:26 +01:00
Carl Bergquist f36aa2e953 Merge branch 'patch-1' of https://github.com/devkid/grafana into devkid-patch-1 
* 'patch-1' of https://github.com/devkid/grafana:
  Add default message for Pushover notifications
 2017-12-19 14:30:09 +01:00
Carl Bergquist 644c2f7fb0 test: remove unused code 2017-12-19 11:23:21 +01:00
Carl Bergquist 66cf224e31 alerting: make alert extractor backwards compatible 
closes #10270
 2017-12-19 11:20:05 +01:00
Carl Bergquist 1816e89730 alerting: move test json into files 2017-12-19 10:22:26 +01:00
Torkel Ödegaard 51ec64f872 fix: reduced team name column length, fixes #10244 2017-12-18 13:38:29 +01:00
Torkel Ödegaard a8a5f8181b fix: viewers can edit now works correctly 2017-12-15 14:19:49 +01:00
Torkel Ödegaard c395237710 Merge branch Grafana v5 'develop' branch 2017-12-15 12:06:09 +01:00
Torkel Ödegaard 8905c8e5fb Merge branch 'team_member_count' of https://github.com/bergquist/grafana into develop 2017-12-15 11:53:47 +01:00
Daniel Lee 2b814738c1 dashfolder: change to migration text 
First index for the dashboard_acl table had the word
unique in the migration description even though the
index is not unique
 2017-12-15 11:35:14 +01:00