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
15,010 Commits 1,119 Branches 715 Tags
443ff5deb4b010f321d41f04f676543c6c2bdb8e
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Marcus Efraimsson 3cf6a1a94b changelog: add notes about closing #11920 
[skip ci]
 2018-06-27 15:17:15 +02:00
Marcus Efraimsson 18032b374b changelog: add notes about closing #11920 
[skip ci]
 2018-06-27 15:11:44 +02:00
Marcus Efraimsson f1ab1a26e9 changelog: update 
[skip ci]
 2018-06-27 14:48:55 +02:00
Marcus Efraimsson 6fa87e6278 docs: upd what's new in v5.2 2018-06-27 14:20:36 +02:00
Marcus Efraimsson b011444246 release 5.2.0 2018-06-27 11:39:04 +02:00
Marcus Efraimsson e378f6db88 docs: update index with link to what's new in 5.2 instead of 5.0 2018-06-27 11:35:53 +02:00
Marcus Efraimsson ec3a4e105f changelog: add notes about closing #12385 
[skip ci]
 2018-06-26 18:11:56 +02:00
Marcus Efraimsson 06daae2179 Merge pull request #12412 from grafana/12393_login 
login: fix layout issues
 2018-06-26 18:01:54 +02:00
Marcus Efraimsson 8d535dd90d docs: upd what's new in v5.2 
[skip ci]
 2018-06-26 15:42:34 +02:00
Marcus Efraimsson e256c61b54 docs: upd what's new in v5.2 2018-06-26 15:37:22 +02:00
Marcus Efraimsson 9f02927761 login: fix layout issues 2018-06-26 15:19:57 +02:00
Marcus Efraimsson bd805544c5 build: yarn should be included out of the box on circle ci 2018-06-26 15:19:04 +02:00
Marcus Efraimsson 5a2cf5863d Merge pull request #12399 from grafana/12140_docs 
docs: update installation instructions
 2018-06-26 10:37:22 +02:00
Marcus Efraimsson db12e8d52d changelog: add notes about closing #11968 
[skip ci]
 2018-06-26 10:32:32 +02:00
Marcus Efraimsson ceba0490f8 Merge pull request #12395 from grafana/11968_variable_key_value 
Set correct text in drop down when variable is present in url
 2018-06-26 10:29:21 +02:00
Marcus Efraimsson 31239f33ed docs: update installation instructions 2018-06-25 17:22:31 +02:00
Marcus Efraimsson c23f9a1f37 changelog: add notes about closing #11868 
[skip ci]
 2018-06-25 16:32:32 +02:00
Marcus Efraimsson 2b3bfd2f65 Merge pull request #12198 from grafana/11868_missing_phantom 
enhance error message if phantomjs executable is not found
 2018-06-25 16:27:12 +02:00
Marcus Efraimsson f106de0efd enhance error message if phantomjs executable is not found 
if arm build, explain that phantomjs is not included by default in arm
builds. If not explain that phantom js isn't installed correctly
 2018-06-25 16:06:52 +02:00
Marcus Efraimsson ed1fec8e0f changelog: add notes about closing #12248 
[skip ci]
 2018-06-25 15:24:12 +02:00
Marcus Efraimsson 98a7f258af Merge pull request #12392 from dehrax/12248-fix 
Fix selecting current dashboard from search does not reload dashboard
 2018-06-25 15:21:24 +02:00
Marcus Efraimsson 5280084480 set correct text in drop down when variable is present in url using key/values 2018-06-25 14:59:28 +02:00
Marcus Efraimsson 7797a66b58 changelog: add notes about closing #12383 
[skip ci]
 2018-06-25 13:17:33 +02:00
Marcus Efraimsson 1726f6358f Merge pull request #12383 from CorpGlory/master 
Set $rootScope in DatasourceSrv
 2018-06-25 11:14:55 +02:00
Marcus Efraimsson 8ba869ac72 changelog: add notes about closing #12359 
[skip ci]
 2018-06-21 10:50:28 +02:00
Marcus Efraimsson 45610ecd89 Merge pull request #12363 from grafana/12359_sign_rpm_packages 
build: fix signing of multiple rpm packages
 2018-06-21 10:45:09 +02:00
Marcus Efraimsson e617e23927 build: fix signing of multiple rpm packages 2018-06-21 10:27:59 +02:00
Marcus Efraimsson 8b5d78a63e docs: what's new in v5.2 and docker installation updates 
[skip ci]
 2018-06-20 18:53:17 +02:00
Marcus Efraimsson cce9632837 changelog: add notes about closing issue 
https://github.com/grafana/grafana-docker/issues/170
[skip ci]
 2018-06-20 15:38:13 +02:00
Marcus Efraimsson 5a5601a8d2 changelog: add notes about 5.2.0-beta2 
[skip ci]
 2018-06-20 13:56:24 +02:00
Marcus Efraimsson 76df428ea2 changelog: add notes about closing #12240 
[skip ci]
 2018-06-20 13:54:57 +02:00
Marcus Efraimsson 3199287ce0 changelog: add notes about closing #12256 
[skip ci]
 2018-06-20 13:20:03 +02:00
Marcus Efraimsson 051ddb245d Merge pull request #12346 from grafana/12256_export 
Make sure to process panels in collapsed rows when exporting dashboard
 2018-06-20 13:17:32 +02:00
Marcus Efraimsson 9532cfee5f changelog: add notes about closing #11792 
[skip ci]
 2018-06-20 13:16:23 +02:00
Marcus Efraimsson 296a841685 Merge pull request #12123 from alexanderzobnin/fix-11792 
graph: fix legend decimals precision calculation
 2018-06-20 13:08:17 +02:00
Marcus Efraimsson ae07fc29e2 changelog: add notes about closing #12315 
[skip ci]
 2018-06-20 13:04:39 +02:00
Marcus Efraimsson 2cbec532ee Merge pull request #12345 from grafana/12315_dash_links 
Fix dashboard drop down links
 2018-06-20 13:00:17 +02:00
Marcus Efraimsson 4ef4a4d3a7 dashboard: fix drop down links 2018-06-20 12:41:11 +02:00
Marcus Efraimsson 41ac8d4cd5 fix regressions after save modal changes of not storing time and variables per default 
Fix problem with adhoc variable filters not handled.
Fix problem with saving variables and time per default when saving a
dashboard as/first time.
Fix updating dashboard model after save with saving time/variables
enabled so that next time you save you won't get checkboxes for save
time/variables unless any values changed.
Tests validating correctness if time/variable values has changed.
 2018-06-20 09:52:29 +02:00
Marcus Efraimsson a2e08dc4e8 make sure to process panels in collapsed rows when exporting dashboard 2018-06-19 16:56:14 +02:00
Marcus Efraimsson d450ec94eb changelog: add notes about closing #3132 
[skip ci]
 2018-06-19 15:04:49 +02:00
Marcus Efraimsson f73c04086c docs: update installation instructions 2018-06-19 15:00:45 +02:00
Marcus Efraimsson b1cf1acb71 Merge pull request #10970 from mmolnar/master 
ldap: allow use of DN in group_search_filter_user_attribute and member_of
 2018-06-19 14:40:05 +02:00
Marcus Efraimsson a60332d459 changelog: add notes about closing #12343 
[skip ci]
 2018-06-19 13:54:37 +02:00
Marcus Efraimsson 5377ad4e96 remove unused argument in default scenario of guardian test 2018-06-19 12:34:34 +02:00
Marcus Efraimsson 9a4ccdf388 changelog: add notes about closing #12278 
[skip ci]
 2018-06-18 11:28:33 +02:00
Marcus Efraimsson 9271e48513 Merge pull request #12317 from grafana/12278_snapshot_annotations 
Copy correct annotation props when creating a snapshot
 2018-06-18 11:24:04 +02:00
Marcus Efraimsson b72c45f735 changelog: add notes about closing #11076 
[skip ci]
 2018-06-18 11:22:55 +02:00
Marcus Efraimsson 004142a1e4 Merge pull request #12263 from grafana/11076_current_org 
Set current org when adding/removing user to org
 2018-06-18 11:19:42 +02:00
Marcus Efraimsson a738347957 snapshot: copy correct props when creating a snapshot 2018-06-18 11:04:16 +02:00
Marcus Efraimsson 6d48d0a80c set current org when adding/removing user to org 
To not get into a situation where a user has a current organization assign which he is
not a member of we try to always make sure that a user has a valid current organization
assigned.
 2018-06-18 09:30:01 +02:00
Marcus Efraimsson ab9f0e8edd changelog: add notes about closing #10707 
[skip ci]
 2018-06-18 09:03:30 +02:00
Marcus Efraimsson 18167f1c18 Merge pull request #12299 from grafana/10707_whitelist 
auth proxy: whitelist proxy ip instead of client ip
 2018-06-18 09:00:41 +02:00
Marcus Efraimsson c02dd7462a cloudwatch: handle invalid time range 2018-06-15 15:48:25 +02:00
Marcus Efraimsson b418e14bd9 make sure to use real ip when validating white listed ip's 2018-06-15 15:29:43 +02:00
Marcus Efraimsson f0254c201a Merge pull request #12215 from ryantxu/use-ng-if-for-time 
use ng-if for the panel timeInfo
 2018-06-15 12:16:48 +02:00
Marcus Efraimsson a02306bc75 Merge pull request #12295 from bergquist/docker_master 
docs: adds info about grafana-dev container
 2018-06-15 11:32:24 +02:00
Marcus Efraimsson 551957fc4d changelog: add notes about closing #12282 
[skip ci]
 2018-06-15 10:57:19 +02:00
Marcus Efraimsson 5f78ad583f remove papaparse dependency 2018-06-15 10:49:57 +02:00
Marcus Efraimsson 22c7c741eb Merge pull request #12252 from grafana/davkal/ifql-query 
Internal Influx Flux plugin cleanup
 2018-06-15 10:43:34 +02:00
Marcus Efraimsson b62322b128 Merge pull request #12288 from mlclmj/master 
docs: HTTP Endpoint for Deleting an Organization
 2018-06-15 10:37:51 +02:00
Marcus Efraimsson 96287a9061 Merge pull request #12294 from vincent-fuchs/patch-1 
docs: delete_datasources -> deleteDatasources in provisioning
 2018-06-15 10:33:03 +02:00
Marcus Efraimsson 56628996b7 Merge pull request #12280 from dehrax/12224-elastic-response 
karma to jest: 6 test files
 2018-06-14 17:24:36 +02:00
Marcus Efraimsson 0107491195 changelog: add notes about closing #11484 
[skip ci]
 2018-06-14 15:59:31 +02:00
Marcus Efraimsson 81d34137a8 Merge pull request #11484 from manacker/master 
alerting: fix mobile notifications for microsoft teams notifier
 2018-06-14 15:56:18 +02:00
Marcus Efraimsson e6135ffd4f changelog: add notes about closing #11233 
[skip ci]
 2018-06-14 15:39:32 +02:00
Marcus Efraimsson 9dd38031e4 Merge pull request #11233 from flopp999/patch-2 
units: W/m2(energy), l/h(flow) and kPa(pressure)
 2018-06-14 15:36:38 +02:00
Marcus Efraimsson 1626a66bab Merge pull request #12275 from dehrax/12224-exporter 
karma to jest: exporter, playlist_edit_ctrl
 2018-06-14 15:10:06 +02:00
Marcus Efraimsson 25e1d723c6 Merge pull request #12276 from grafana/davkal/expose-react-slate 
Expose react and slate to external plugins
 2018-06-14 14:41:30 +02:00
Marcus Efraimsson 284045748c Merge pull request #12243 from grafana/12236-ds-proxy-tokens 
dsproxy: allow multiple access tokens per datasource
 2018-06-14 14:03:08 +02:00
Marcus Efraimsson 99c188f626 Merge pull request #12273 from grafana/12247-link-icon 
fix panel link icon positioning
 2018-06-14 13:54:08 +02:00
Marcus Efraimsson 71b0326769 Merge pull request #12237 from dehrax/12224-version-panel 
Convert tests from Karma to Jest
 2018-06-14 10:13:46 +02:00
Marcus Efraimsson ff3db60e2e changelog: add notes about closing #10796 
[skip ci]
 2018-06-13 13:13:57 +02:00
Marcus Efraimsson 2288e01752 Merge pull request #12169 from alexanderzobnin/feat-10796 
Import dashboard to folder
 2018-06-13 13:10:52 +02:00
Marcus Efraimsson c39979a557 Merge pull request #12255 from dehrax/docs-dev-grafana 
Update "Building from source" docs
 2018-06-13 12:46:45 +02:00
Marcus Efraimsson 3b824a5e00 Merge pull request #12244 from kdombeck/patch-1 
docs: correct provisioning link
 2018-06-13 09:14:32 +02:00
Marcus Efraimsson d8f269954a changelog: add notes about closing #11963 
[skip ci]
 2018-06-12 13:10:48 +02:00
Marcus Efraimsson c0830e9cde mattn/go-sqlite3 v1.6.0 to v1.7.0 2018-06-07 16:53:39 +02:00
Marcus Efraimsson 7d508df1b4 changelog: add notes about closing #11074 
[skip ci]
 2018-06-07 16:24:45 +02:00
Marcus Efraimsson 3fb4eb7322 Merge pull request #12175 from grafana/davkal/12168-fix-explore-setting 
Respect explore settings in config ini
 2018-06-07 12:08:42 +02:00
Marcus Efraimsson cb9fc3f6b4 changelog: add notes about closing #11657 
[skip ci]
 2018-06-05 09:35:24 +02:00
Marcus Efraimsson 962f996799 always show server admin link in sidenav if grafana admin 2018-06-04 19:28:01 +02:00
Marcus Efraimsson d09749eaaa Merge pull request #12153 from grafana/googleOAuthDocs 
update google auth config docs
 2018-06-04 18:50:28 +02:00
Marcus Efraimsson 58406707f9 changelog: add notes about closing #11525 
[skip ci]
 2018-06-04 18:10:28 +02:00
Marcus Efraimsson 38c94bb633 Merge pull request #12117 from grafana/11525-dashlist-folder-picker 
Fix search by folder in dashboard list panel
 2018-06-04 18:08:38 +02:00
Marcus Efraimsson 09a0a49c52 changelog: add notes about closing #11882 
[skip ci]
 2018-06-04 16:32:42 +02:00
Marcus Efraimsson 6281910591 Merge pull request #12037 from grafana/login-change-password 
change admin password after first login
 2018-06-04 16:21:45 +02:00
Marcus Efraimsson 33ee1fba30 Merge pull request #12150 from grafana/12120_whats_new 
Draft: What's new in v5.2
 2018-06-04 15:17:31 +02:00
Marcus Efraimsson 38906acda9 elasticsearch: sort bucket keys to fix issue wth response parser tests 2018-06-04 15:15:47 +02:00
Marcus Efraimsson 0d5579b4c0 docs: what's new in v5.2 2018-06-04 14:31:43 +02:00
Marcus Efraimsson 7453df2662 changelog: add notes about closing #11167 
[skip ci]
 2018-06-04 11:57:13 +02:00
Marcus Efraimsson e258f30704 Merge pull request #12129 from alexanderzobnin/fix-11167 
alert list panel: show alerts for user with viewer role
 2018-06-04 11:54:51 +02:00
Marcus Efraimsson f5cf926364 changelog: add notes about closing #5893 
[skip ci]
 2018-06-01 15:23:26 +02:00
Marcus Efraimsson b6afe5f2e8 Merge pull request #11380 from WPH95/feature/add_es_alerting 
elasticsearch: alerting support
 2018-06-01 15:17:28 +02:00
Marcus Efraimsson b67872bc35 changelog: add notes about closing #11500, #8168, #6541 
[skip ci]
 2018-06-01 14:49:14 +02:00
Marcus Efraimsson ce75afa413 docs: update alerting docs with alerting support for elasticsearch 2018-06-01 12:26:20 +02:00
Marcus Efraimsson b8ff3b1e3f remove dead code 2018-05-31 19:05:32 +02:00
Marcus Efraimsson dcac63936b elasticsearch: minor refactor 
Handle all replacements if interval template variables in the client.
Fix issue with client and different versions.
Adds better tests of the client
 2018-05-31 19:02:20 +02:00
Marcus Efraimsson 28f0acd854 Merge branch 'master' into feature/add_es_alerting 2018-05-31 16:33:07 +02:00
Marcus Efraimsson a2cd05f6db changelog: update 
[skip ci]
 2018-05-31 16:31:53 +02:00