IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2026-07-30 08:18:10 -05:00
Code Issues Packages Projects Releases Wiki Activity
13,891 Commits 1,121 Branches 715 Tags
90aab445586b4a5ca00fba4d2f6de72d223d1235
Commit Graph
13891 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Jarno Tuovinen 90aab44558 Use curly brackets around hyperlink help text #11478 (#11479) 2018-04-04 20:07:22 +02:00
Marcus Efraimsson 9841c81952 Notes for closing #7119 
[skip ci]
 2018-04-04 13:40:08 +02:00
Daniel Lee 4b1c1acab4 changelog: adds note for #11128 2018-04-03 22:40:48 +02:00
Daniel Lee 70eb281840 variables: adds test for variable sorting 
ref #11280
 2018-04-03 22:34:16 +02:00
Chris Ross 4a93766143 Add case-insensitive sort for variables. 2018-04-03 22:24:21 +02:00
Daniel Lee a6c7635528 graphite: fixes #11434 2018-04-03 19:39:50 +02:00
Daniel Lee 533f3a9e8c settings: fixes test 
For some reason, the url parse does not fail anymore for curly
braces. Add a colon in the first segment to make sure the url
parse fails.
 2018-04-03 19:09:49 +02:00
Daniel Lee 1f3602c7dd Merge pull request #11428 from bergquist/11281_fix 
Avoid panic when GF_DATABASE_URL contains illegal chars
 2018-04-03 16:59:25 +02:00
Daniel Lee a6a08038d4 Merge pull request #11416 from grafana/ie11_graphpanel_edit 
Graphpanel Edit fix for IE11
 2018-04-03 15:44:54 +02:00
Daniel Lee 1a6c632264 Merge pull request #11396 from grafana/ie11_search_and_popup 
fixed alignment in search + fixed issue ie popup
 2018-04-03 15:06:08 +02:00
Daniel Lee cdc0b04840 Merge pull request #11393 from grafana/ie_sidemenu 
sidemenu fix for internet explorer 11,
 2018-04-03 15:00:25 +02:00
Daniel Lee 6bc5896b3a Merge pull request #11381 from grafana/ie11_login 
styled login page for ie11
 2018-04-03 14:35:12 +02:00
Daniel Lee ebbbf170f1 Merge pull request #11463 from grafana/tabbed-close-btn-hover 
Fix for tabbed-view btn in light theme
 2018-04-03 10:31:14 +02:00
Patrick O'Carroll feb222f633 changed variable for tabbed close btn hover, and changed text-strong variable for lighttheme, removed commented out variable 2018-04-03 09:53:14 +02:00
Daniel Lee 8b2441e098 mssql: typos in help sections 
Fixes #11455
 2018-04-03 09:51:29 +02:00
Alexey Velikiy 6320bdf393 Webpack Grafana plugin template project to links (#11457) 2018-04-03 06:21:36 +02:00
Alexey Velikiy 00f67ea7c7 rm panel.type constrain from threshold_mapper.ts (#11448) 2018-04-02 08:13:22 +02:00
Alexey Velikiy 13deb891f3 No need for node_modules/bin in npm run-script (#11449) 
how run-script works: https://docs.npmjs.com/cli/run-script
 2018-04-02 08:09:10 +02:00
Carl Bergquist 880293eea1 Merge pull request #11445 from svenklemm/docs-dashboard 
docs: fix some typos in dashboard docs
 2018-03-30 20:41:31 +02:00
bergquist 4538ffc0e8 changelog: adds note about closing #11555 2018-03-30 20:30:57 +02:00
Carl Bergquist 375cc8de8f Merge pull request #11399 from roidelapluie/promba 
Fix #10555 #6888 Backslash in Prometheus variables
 2018-03-30 20:26:08 +02:00
Sven Klemm 2bdcebb5b1 add article 2018-03-30 16:47:51 +02:00
Sven Klemm cb156ee30b fix some typos 2018-03-30 16:42:48 +02:00
Julien Pivotto 1f1719c498 Fix #10555 #6888 Better escape for Prometheus variables 
Prior this commit, C:\bar was escaped C:\\\bar. Should be C:\\\\bar.

Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
 2018-03-29 09:49:15 +02:00
bergquist 45d9bfca97 print to stderr since logger might not exist 2018-03-28 22:51:21 +02:00
bergquist 2ccbf12d1c settings: return error instead of ignoring it 
closes #11281
 2018-03-28 22:32:58 +02:00
Marcus Efraimsson b41370ca49 Merge pull request #11421 from this-is-angus/patch-1 
Fixed typo in upgrading.md
 2018-03-28 16:37:50 +02:00
Angus Burroughs e645c51f7c Fixed typo in upgrading.md 
Line 26: 'you' to 'your' in "make a backup of you 'grafana.db'"
 2018-03-28 16:26:15 +02:00
Daniel Lee 86776154cc docs: rpm install page - update to centos 7 2018-03-28 15:35:51 +02:00
Daniel Lee 485d0f1c95 docs: install pages for v5.0.4 2018-03-28 15:19:46 +02:00
Daniel Lee 33bd979494 changelog: another update for v5.0.4 2018-03-28 14:57:11 +02:00
Daniel Lee b1d3535cbb changelog: update for v5.0.4 2018-03-28 14:50:27 +02:00
bergquist df89be4de9 changelog: adds note about closing issues 2018-03-28 14:21:10 +02:00
Carl Bergquist 0a1bc53f3a Merge pull request #11406 from bergquist/gomail 
tech: migrates to none deprecated mail lib
 2018-03-28 14:19:39 +02:00
Patrick O'Carroll a3f15ced68 fixed graphpanel editmode and custom width for right side legend for IE11 2018-03-28 14:19:17 +02:00
Carl Bergquist f009443a6f Merge pull request #11330 from digineo/auth-ipv6 
Support IPv6 in Auth proxy white list
 2018-03-28 14:17:43 +02:00
Daniel Lee 4b6fd675e2 Merge pull request #11390 from bergquist/notifiers_default_value 
Default value for uploading images in alert notifiers
 2018-03-28 13:06:09 +02:00
Carl Bergquist d37e8df991 Merge pull request #11412 from tettaji/variable-docs 
Clarified formatting multiple values doc
 2018-03-28 13:01:12 +02:00
Daniel Lee 208cbd1189 Merge pull request #11405 from bergquist/alert_link 
alert: fixes broken link back to grafana
 2018-03-28 13:00:32 +02:00
Carl Bergquist 36adce17df Merge pull request #11411 from grafana/11247-save-alerts 
dashboard: allow alerts to be saved for new/provisioned dashboards
 2018-03-28 12:59:14 +02:00
bergquist d29563ff8e alerting: bad default state for notifiers 
when we made image upload optional we didnt
show the default value properly in the UI. Which
caused confusing. This commit apply the default
values to existing notifiers in the edit pages
and reverts back to using uploadimage=true as the
default value.
 2018-03-28 12:52:39 +02:00
Tariq Ettaji 8985e5ac53 Clarified formatting multiple values doc 2018-03-28 12:51:12 +02:00
Daniel Lee 68833fa978 dashboard: allow alerts to be saved for new/provisioned dashboards 
This changes the logic for the alert validation in the extractor. Validation
is executed twice, once before attempting to save the alerts and once after
saving the dashboard while saving the alerts to the db. The first validation
will not require that the alert has a dashboard id which allows new dashboards
with alerts to be saved.

Fixes #11247
 2018-03-28 11:32:05 +02:00
bergquist 9e2e6fc586 add fallback for gravatar in org/admin view 
closes #11095
 2018-03-27 22:52:29 +02:00
bergquist f2755982c3 tech: migrates to none deprecated mail lib 
gomail is missing a maintainer so we are
switching to an active fork

ref https://github.com/go-gomail/gomail/issues/108

closes #7189
 2018-03-27 21:53:46 +02:00
bergquist 2743e8be20 docs: not about email notifications and local img store 
cloes #11054
 2018-03-27 21:21:38 +02:00
bergquist 5596707531 alert: fixes broken link back to grafana 
If Grafana was configured to use a subpath it
was included twice in the link from the
alert notification back to Grafana.

closes #11403
 2018-03-27 20:26:51 +02:00
Marcus Efraimsson 95a4d61d10 Merge pull request #11094 from infernix:value-to-text-upstream 2018-03-27 19:06:40 +02:00
Marcus Efraimsson f673ec16d1 table panel: additional fixes for value to text mapping 
Make the value to text mapping more similar to singlestat solution.
Adds more tests.
Also, allows string to be mapped to other string besides numeric values.
 2018-03-27 19:04:45 +02:00
aandrew 67f0382222 add value to text mapping 2018-03-27 19:00:22 +02:00