Alexander Zobnin
a4972f44ad
fix missing profile icon ( #10469 )
2018-01-09 13:58:03 +01:00
Daniel Lee
ccf1a5124b
plugin: fix path for app plugins on windows
...
This fixes when an app that contains a plugin (which means it has
a filepath with more parts) gets a back slash in the path for the
plugin module. The string replace now replaces all back slashes and
not just the first one.
2018-01-04 17:32:57 +01:00
Torkel Ödegaard
c42a232644
Merge branch 'react-mobx'
2018-01-04 09:12:57 +01:00
Oleksandr Kushchenko
5c94daa011
Add AWS/AmazonMQ namespace metrics to CloudWatch tsdb ( #10407 )
2018-01-03 11:11:31 +01:00
Torkel Ödegaard
029317ed18
tech: alert list react migration progress
2017-12-31 14:16:19 +01:00
Carl Bergquist
16ef068342
Merge pull request #10373 from bergquist/dashboard_folder_provisioning
...
Dashboards as cfg: create dashboard folder if missing
2017-12-28 16:13:18 +01:00
bergquist
a4e4b76785
fixes log typo
2017-12-28 15:51:31 +01:00
bergquist
b840514797
imguploader: log if the configuration is invalid
2017-12-28 15:48:19 +01:00
Carl Bergquist
29f58475a3
Merge pull request #8956 from saada/azure-external-image-store
...
Azure Blob Storage external image uploader
2017-12-28 15:34:20 +01:00
bergquist
8a5fe5b0df
renderer: avoid calling Handle twice
2017-12-28 14:37:10 +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
Mahmoud Saada
af15e3c0d0
Implement Azure Blob external image uploader
2017-12-27 08:53:00 -05:00
Torkel Ödegaard
3e7420320c
Merge branch 'master' into react-mobx
2017-12-26 13:53:39 +01:00
bergquist
e234cf5b18
prom: removes limitation of one query per tsdb call
2017-12-22 12:22:42 +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
887af65ca9
Merge pull request #10264 from SteelPhase/patch-2
...
fix: Extra forward slash added when org redirect middleware is called (#10263 )
2017-12-19 13:58:33 +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
SteelPhase
a320a83138
Use strings.TrimPrefix to make sure relative url doesn't start with forward slash
...
Closes grafana/grafana#10263
2017-12-19 03:01:33 -05:00
Torkel Ödegaard
40482d9ada
Merge branch 'master' of github.com:grafana/grafana
2017-12-18 13:38:54 +01:00
Torkel Ödegaard
51ec64f872
fix: reduced team name column length, fixes #10244
2017-12-18 13:38:29 +01:00
Scott Ernst
fcf1ff10d2
Kinesis Metric Capitalization
...
Fixes the capitalization of the AWS/Kinesis ShardId metric, which
was incorrectly specified as "ShardID" instead of "ShardId" as
specified in the AWS documentation:
http://docs.aws.amazon.com/streams/latest/dev/monitoring-with-cloudwatch.html
2017-12-15 12:44:13 -06:00
Torkel Ödegaard
36fe8f5873
menu: fixed create default url
2017-12-15 15:17:05 +01:00
Torkel Ödegaard
a8a5f8181b
fix: viewers can edit now works correctly
2017-12-15 14:19:49 +01:00
Torkel Ödegaard
2797e8e2d0
profile: use name or fallback for profile page
2017-12-15 13:06:11 +01:00
Torkel Ödegaard
fdf4bad1b7
fix: sidemenu profile main text is now username instead of name
2017-12-15 13:03:07 +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
bergquist
256f7176a2
teams: add team count when searching for team
...
closes #10207
2017-12-15 11:08:06 +01:00
Torkel Ödegaard
581257416e
Merge remote-tracking branch 'origin/develop-icons' into develop
2017-12-14 19:56:19 +01:00
Carl Bergquist
45eda16a87
Merge pull request #10203 from queeno/dashboard_provisioner_id_validation
...
Avoid ID validation before provisioning dashboards
2017-12-14 15:43:07 +01:00
Robin Gustafsson
cf7a49977f
proxyds: delete cookies except those listed in keepCookies
2017-12-14 11:46:44 +01:00
Daniel Lee
f1aa7dcd52
proxyds: failing test for keepCookies
...
If the cookies are specified in the keepCookies property then they
should not be deleted from proxied requests for data sources
2017-12-14 11:46:44 +01:00
Marcus Efraimsson
e136b7c286
dashfolders: /dashboards should render index page with a 200 OK
2017-12-14 11:30:57 +01:00
Daniel Lee
f1b1dbc6dd
dashboard: fix test after merge conflict
2017-12-14 09:34:00 +01:00
Simon Aquino
5dbbf1826c
Avoid ID validation before provisioning dashboards
...
Attempting to provision grafana using a previously exported
JSON dashboard with the ID field already set, might result in an error.
In fact, Grafana might believe that a dashboard with that
given ID already exists in the database, throwing an error if it doesn't.
(see pkg/services/sqlstore/dashboard.go#L32)
The dashboard provisioner should set the dashboard id to zero in order to
avoid this behaviour inducing the dashboard to be written to the DB
without ID validation.
2017-12-14 02:07:50 +01:00
Trent White
e2bbb85daa
new icons created and added to nav
2017-12-13 17:48:44 -05:00
Torkel Ödegaard
a7645b710d
Merge remote-tracking branch 'origin/master' into develop
2017-12-13 19:18:10 +01:00
bergquist
ade734168c
alertmanager: endAt should only be used if we have the correct value
2017-12-13 19:17:00 +01:00
bergquist
3691faf136
alertmanager: code style
2017-12-13 19:17:00 +01:00
