From 7b45a2ec519f64a79a665cead374ea9de8a5f101 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Fri, 12 Sep 2014 13:15:06 +0200 Subject: [PATCH 01/10] Small fix to scripted async dashboard example --- src/app/dashboards/scripted_async.js | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/app/dashboards/scripted_async.js b/src/app/dashboards/scripted_async.js index 84e5d976f6b..31d23f2dde2 100644 --- a/src/app/dashboards/scripted_async.js +++ b/src/app/dashboards/scripted_async.js @@ -35,11 +35,9 @@ return function(callback) { // Set a title dashboard.title = 'Scripted dash'; - dashboard.services.filter = { - time: { - from: "now-" + (ARGS.from || timspan), - to: "now" - } + dashboard.time = { + from: "now-" + (ARGS.from || timspan), + to: "now" }; var rows = 1; @@ -78,4 +76,4 @@ return function(callback) { callback(dashboard); }); -} \ No newline at end of file +} From bf9eaea33450c8c322e70056efd3b0e46192fd1a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Fri, 12 Sep 2014 13:19:17 +0200 Subject: [PATCH 02/10] Updated lastest.json --- latest.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/latest.json b/latest.json index 38e862a643a..c66de1bc179 100644 --- a/latest.json +++ b/latest.json @@ -1,4 +1,4 @@ { - "version": "1.7.0", - "url": "http://grafanarel.s3.amazonaws.com/grafana-1.7.0" + "version": "1.8.0-rc1", + "url": "http://grafanarel.s3.amazonaws.com/grafana-1.8.0-rc1" } From 15f2b2cf9a8a8318fbe0a5d52377cd32286a18ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Sat, 13 Sep 2014 16:19:33 +0200 Subject: [PATCH 03/10] Annotations: fixed InfluxDB annotation query, added unit test for annotation query, Fixes #802 --- CHANGELOG.md | 7 ++++- .../services/influxdb/influxdbDatasource.js | 2 +- src/test/specs/influxdb-datasource-specs.js | 26 ++++++++++++++++++- 3 files changed, 32 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a182bbf6cad..6d6c63ee023 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,9 @@ -# 1.8.0 (unreleased) +# 1.8.0 (2014-09-12) + +**Fixes** +- [Issue #802](https://github.com/grafana/grafana/issues/802). Annotations: Fix when using InfluxDB datasource + +# 1.8.0-RC1 (2014-09-12) **UI polish / changes** - [Issue #725](https://github.com/grafana/grafana/issues/725). UI: All modal editors are removed and replaced by an edit pane under menu. The look of editors is also updated and polished. Search dropdown is also shown as pane under menu and has seen some UI polish. diff --git a/src/app/services/influxdb/influxdbDatasource.js b/src/app/services/influxdb/influxdbDatasource.js index d9a7d8b378c..c076fb2c5e1 100644 --- a/src/app/services/influxdb/influxdbDatasource.js +++ b/src/app/services/influxdb/influxdbDatasource.js @@ -64,7 +64,7 @@ function (angular, _, kbn, InfluxSeries, InfluxQueryBuilder) { InfluxDatasource.prototype.annotationQuery = function(annotation, rangeUnparsed) { var timeFilter = getTimeFilter({ range: rangeUnparsed }); var query = annotation.query.replace('$timeFilter', timeFilter); - query = templateSrv.replace(annotation.query); + query = templateSrv.replace(query); return this._seriesQuery(query).then(function(results) { return new InfluxSeries({ seriesList: results, annotation: annotation }).getAnnotations(); diff --git a/src/test/specs/influxdb-datasource-specs.js b/src/test/specs/influxdb-datasource-specs.js index ddf7db48282..3851b0cd898 100644 --- a/src/test/specs/influxdb-datasource-specs.js +++ b/src/test/specs/influxdb-datasource-specs.js @@ -8,7 +8,7 @@ define([ var ctx = new helpers.ServiceTestContext(); beforeEach(module('grafana.services')); - beforeEach(ctx.providePhase()); + beforeEach(ctx.providePhase(['templateSrv'])); beforeEach(ctx.createService('InfluxDatasource')); beforeEach(function() { ctx.ds = new ctx.service({ urls: [''], user: 'test', password: 'mupp' }); @@ -70,6 +70,30 @@ define([ }); + describe('When issuing annotation query', function() { + var results; + var urlExpected = "/series?p=mupp&q=select+title+from+events.backend_01"+ + "+where+time+%3E+now()+-+1h&time_precision=s"; + + var range = { from: 'now-1h', to: 'now' }; + var annotation = { query: 'select title from events.$server where $timeFilter' }; + var response = []; + + beforeEach(function() { + ctx.templateSrv.replace = function(str) { + return str.replace('$server', 'backend_01'); + }; + ctx.$httpBackend.expect('GET', urlExpected).respond(response); + ctx.ds.annotationQuery(annotation, range).then(function(data) { results = data; }); + ctx.$httpBackend.flush(); + }); + + it('should generate the correct query', function() { + ctx.$httpBackend.verifyNoOutstandingExpectation(); + }); + + }); + }); }); From 96a0d0aefa0005211d35f2c2af43731e1fa2384e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Sat, 13 Sep 2014 16:38:01 +0200 Subject: [PATCH 04/10] fixed changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6d6c63ee023..2301c2b35a8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -# 1.8.0 (2014-09-12) +# 1.8.0 (unreleased) **Fixes** - [Issue #802](https://github.com/grafana/grafana/issues/802). Annotations: Fix when using InfluxDB datasource From 92bec31ccb158a5edd234e302adae2262cb46ff1 Mon Sep 17 00:00:00 2001 From: starshayayord Date: Mon, 15 Sep 2014 18:51:58 +0600 Subject: [PATCH 05/10] Update index.html disable google translate plugin --- src/index.html | 1 + 1 file changed, 1 insertion(+) diff --git a/src/index.html b/src/index.html index 63e837abfcd..d47f9df9196 100644 --- a/src/index.html +++ b/src/index.html @@ -5,6 +5,7 @@ + Grafana From ff91430fcc9e539671cde35e27a04101a8b202bb Mon Sep 17 00:00:00 2001 From: Torkel Odegaard Date: Tue, 16 Sep 2014 08:01:18 +0200 Subject: [PATCH 06/10] added favicons --- src/app/partials/dashboard_topnav.html | 2 +- src/img/fav16.png | Bin 0 -> 639 bytes src/img/fav32.png | Bin 0 -> 1344 bytes src/index.html | 1 + 4 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 src/img/fav16.png create mode 100644 src/img/fav32.png diff --git a/src/app/partials/dashboard_topnav.html b/src/app/partials/dashboard_topnav.html index 15ea694058c..689b8374b1c 100644 --- a/src/app/partials/dashboard_topnav.html +++ b/src/app/partials/dashboard_topnav.html @@ -1,7 +1,7 @@
- {{dashboard.title}} + {{dashboard.title}}
  • diff --git a/src/img/fav16.png b/src/img/fav16.png new file mode 100644 index 0000000000000000000000000000000000000000..c5cdb319630826dc181f0db531dd3bb911a12fcb GIT binary patch literal 639 zcmV-_0)YLAP)5lV3&)7?pCwvzNyYfP+G>#cbspssP>`<&aJah!@(5^nbg@J-E-nJ~$HEITCfs{%Mu z5ywzA2&&&{c9=Why)J{cO{ka{`}HC0peQUjSb2)|p;tLVMjZ`rW=OqF0V#CtF5%7#Oll6ijN*4Spg(z!Tu*PoHeyM6_W0u0 z{l1j1B6*bTqtP90yUw*x-n0zBk3k#j%O6il?up~RSaq#P;!KX09NNa~MeK~giYr)& z?VglGRiVgRIa6NE%;G5(kc&eyx^p8EyRT(nWKIG2)X|~kRC5@ioGjT!k!;CJQNDgA z`0!Om05lH`t(RFk7R9J%N-76d}YJZc1@A@zranz8z$sHxLMLuY{~ z8#b-oQcJfnwcXBpZtwg1^@nb5=j?Jew(o!MbNPM0@ALki=Xo{a#Gym)XAare`@rSe z*za~{_BoviA%|T9aE8MwDHJxmLqm5L7=gM(rBzo{d~!FQbG0dneU)XmyxzkdX{mV; zn=LM}4$CCBySFu?Z*WIdmGAtF1ROiKYe8FL(%I{oi`GhQN}c0ENX6=VU02e(t+I-J z`yR$Ez~`$hZOY8}vDf2q&WJe*3kL>*YyRzev2xFW`en+t#i4>q6b-meIa374Z2gOB-`@&KM4dm@V?r@Pq^ML)XPmm!u3n)HLl( za&c|bh=8L9DpD_HWZs#rvPZ+AS$vfAD_MF!08&bcX4|R{2Xwli`HfM!#KOY{dW*T#tw z-CCIKo@=ae^w4LyIO$)(<2ZKQJ5W#)(ilVtA#F2fv&bV+)WNw}8#rt4Kv4j~|^V#5>{0ooCarrM$}M-ccfx z&G}nd?M|MOydXK9vPHRA$B&=}C;n`@GaOci%N0|F_p(;wu`mwc{a7_$O;IPUQ}+%H z-M#1aEE_g0PfTJ{ULm35N02>THfY1UH$#`zcKwJ$4l^x#(s6fSuU^Wp^}SAUx{R~deSUw(#t{j(I8w7`@0Mho3W zcPqkEyuX5a{mr5qn#=wqTlM-FJQuq-CPL)*22_zii@MHY!sdPisiYCGLbbwWGs{Oi zG!?*}ZN)7B!2COE%_xZ6j#)ip1)`l?S<^72L+p|o$1*95dPRZ)JzGQhA=s#}?oW~+ zi3p|b2hb7fbI__rxPyvt`}7p3Aoy!l+{%?uhnAi?*8w1sir0OhP&<{WE`(dZgI)@3>;8nM$9xJi6~Sx zj==ipHy_57f1+*WrFk}!Dy6YmXj6@s$Gl1!0_~)b+Ww{Ap6!?{Htt{Ho7-NV?+iws z*QDHlpa4`3;C<}w2dxuHvx0iV3f8WyX&8#<-2VZcG3#(sJVhq}0000Grafana + From 26bb2e0193a90a97f4a234b21e39816769ced26e Mon Sep 17 00:00:00 2001 From: Alexey Remizov Date: Tue, 16 Sep 2014 13:08:28 +0400 Subject: [PATCH 07/10] fix typos --- CHANGELOG.md | 2 +- src/app/partials/graphite/editor.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2301c2b35a8..96a6905d158 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -244,7 +244,7 @@ Read this for more info: - More graphite function definitions - Make "ms" axis format include hour, day, weeks, month and year ([Issue #149](https://github.com/grafana/grafana/issues/149)) - Microsecond axis format ([Issue #146](https://github.com/grafana/grafana/issues/146)) -- Specify template paramaters in URL ([Issue #123](https://github.com/grafana/grafana/issues/123)) +- Specify template parameters in URL ([Issue #123](https://github.com/grafana/grafana/issues/123)) ### Fixes - Basic Auth fix ([Issue #152](https://github.com/grafana/grafana/issues/152)) diff --git a/src/app/partials/graphite/editor.html b/src/app/partials/graphite/editor.html index 4d670255bc0..dcbc4306e0f 100755 --- a/src/app/partials/graphite/editor.html +++ b/src/app/partials/graphite/editor.html @@ -108,7 +108,7 @@
  • - series as paramaters + series as parameters
  • From 5e9ed95684bec0166768c7c4c268532059b39e90 Mon Sep 17 00:00:00 2001 From: Marcus Hammarberg Date: Tue, 16 Sep 2014 17:45:43 +0700 Subject: [PATCH 08/10] Added a favicon. This will resolve issue #796 --- src/favicon.ico | Bin 0 -> 32038 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 src/favicon.ico diff --git a/src/favicon.ico b/src/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..23174fc962385f60e952bc77c2a038aac4843f01 GIT binary patch literal 32038 zcmeI52Y6If+Q%m(5Q-2~M8udn_YR7R1uK3Obrls0SQl4;MS)%Hf?`2jyCQ-J3d`E1 z1VT$7y#b+ykdQziA(W8brkp#;OzM2Ub78U}vexZ;@ALe5&w1N9=e?83WX}B`OePDKgG{vN||9Y4IqXT zrq_Yg>(}rT!uZ#yfKdUX0!9Ul3K$hIDqvK=sDM!cqXI?+j0zYPFe+eFz^H&xf&a}4 zBy3pa8y^*MU0l?PPvX`u-vP4YqL#0Xk6Q6)LUaV*GM=~+H?BGdp9S&J5x07EQYJ*N z?27MiiHRXL6Q70n+>iV-7*O|y6IqMO57ShY*&ND z2^&_1bcmaT{x#;*Me6Y%K>uTMWPl{{OrSp#JiTe{cb!6OwBWF6(Z78T*-naG-Id(W z5nn@>*Lh9?^lDsj1 zJiE{>Y9E&xzrG8)Xl$wJDKXrObz?vU{ZrOYe+l{&)(}QJ54?3so`m&1v8RIwpszo? zT6Aaq>=c~1a}Y%46du^?gU>hU6SFeX&B%Q6yz0#%W&ZxGZuq2Nivari%@qz`)<0j` ztIErK%S(z@mK7gOE-5Tlwz{IN{xy~5 zL(!Gvmt0zM%pW-#xXJfg{mJ~b)#VrBbCCE?3iETjvWC?arN?*G)>O3JgX+q%QTW)2 zT@Fs%|0;1duYomkeBrS9IWJNE7z` zjIj^hJ77+oQxxFWN?ej~SpAWsK_jrq{P?_$f0k3&4-$W+oU_Aj9ZLTQW9-KM2AEHt zW90D=x2#SR`ue%|cY&2MMqW*g4WBeMHRd)pHuOEAF`4R|PT$4`_ZuJ$B%j362Dhs} zYwJt@8``foG`K$}E~2rap-+RWKA@$+^-NQPdoww6kjwFT0^e2O652Q6o6T4VcLqp8 zH%gy_+jT`VxroaKJDVEF?RLG7&jieVAicY`&}oGzEB?8vRTqcHh7X5jM?U7yhZ{vW%&92EABQ=ht$=x0B4- z($aiCV^t&n&*gS?X=rHB?@5nRN7td%+WBkh+(CbG)GJq2ir${4hR%%Pe{wFqw7asV zPK?>3sk!NFWM^sXcu76>J|Lj6snN&N+}N45`?6;FzP}7i53dk@$aLy4DZRe&Oze^1 zD0925xw%>YnfK;J7YIgyGo-FxiNojI5{JGXuaA`GGSQiwi$iNfPH45*!FZFe$Pzy7 zeaLYq<5VNBZLjBE^d)vBv1!Dn(!Zv?{nxYu%SAVG-bemeFrD1``yA~ZVKrh)*9xtt z$J44XuT(iV@MrKabG!%nBFF@V_*`*znIoKaJsVyn^!Klh^CIWdt zRUqer>p-CNu@npWp8Sm-TP-$me*!wj{@gw}{F%dzdS2e|c+VTjJ!-qR*xnB-tEmes zvp#DQ9$q7@{h8YvU>}fms0AfpEf_Jns;);^rFfluY1A<2bn~GuLs)|opKa#Ttbw1g zF64Rz6a)D>_^_d_PJfLM^ZLp4pYl8GbmRPx&Ri;bu=ZP-%a`Qbz&d}=eA_8_MYA`M)t!}_l*qtHZI4URoSTIX@|_Y;_J|C@%VX}juGeX zc3dBnCGHK+6`z{(#16)ImHd59m&dD9_KP#|%?8Jned3hAaikBqI-Q^8(BJdCFRA8dUXZwqmC#0~41-@L==W8SQFQ#NbosawRg#7-i|SNLWVlWWct zi_KZ$H`GFZkM0=%V|`_V=BK1;!G?TxAu~OBg;w^QV;}**b(SN}5Q(t#Kww|ABw|wRZ zwEWr8Pn~TKvdp)?Ks|!gIre^*Pwby#yHs7^2v_IZzqEX6pJMsgzSgq99&cG_{{Y_> ze0EtDIu_7w1P%0$AvNIn324N>f_yv3{TXA8XY5OvOV6LXhF|Ni&anHa@7RY?1O5G5 zean8m`kr0?yr%xiexv%X{bBVDyBU3y`o4W2atN>y^Qii^U8P+_`$P3Zdzkux{T5

    aU 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 Date: Tue, 16 Sep 2014 12:06:18 +0200 Subject: [PATCH 09/10] added favicon, Closes #796 --- src/app/partials/dashboard_topnav.html | 5 ++++- src/css/less/bootswatch.dark.less | 2 +- src/css/less/grafana.less | 13 +++++++++++++ src/img/fav16.png | Bin 639 -> 3971 bytes src/img/fav32.png | Bin 1344 -> 3971 bytes src/img/fav_dark_16.png | Bin 0 -> 4837 bytes src/img/fav_dark_32.png | Bin 0 -> 3435 bytes src/index.html | 2 +- 8 files changed, 19 insertions(+), 3 deletions(-) create mode 100644 src/img/fav_dark_16.png create mode 100644 src/img/fav_dark_32.png diff --git a/src/app/partials/dashboard_topnav.html b/src/app/partials/dashboard_topnav.html index 689b8374b1c..b6db19d33aa 100644 --- a/src/app/partials/dashboard_topnav.html +++ b/src/app/partials/dashboard_topnav.html @@ -1,7 +1,10 @@

    - {{dashboard.title}} + + + {{dashboard.title}} +
    • diff --git a/src/css/less/bootswatch.dark.less b/src/css/less/bootswatch.dark.less index d1bfbcf1154..ad9fe11e73d 100644 --- a/src/css/less/bootswatch.dark.less +++ b/src/css/less/bootswatch.dark.less @@ -56,7 +56,7 @@ hr { } .brand { - padding: 15px 20px 15px; + padding: 0px 15px; color: @grayLighter; font-weight: normal; text-shadow: none; diff --git a/src/css/less/grafana.less b/src/css/less/grafana.less index 3e52b7fc94c..da9f300b0e7 100644 --- a/src/css/less/grafana.less +++ b/src/css/less/grafana.less @@ -35,6 +35,19 @@ } } +.logo-icon { + width: 26px; + padding: 12px 11px 0 0; + display: block; + float: left; +} + +.page-title { + padding: 15px 0; + display: block; + float: left; +} + .row-button { width: 24px; } diff --git a/src/img/fav16.png b/src/img/fav16.png index c5cdb319630826dc181f0db531dd3bb911a12fcb..827cd972e4bbb57d74493f8f19c620ebf7a15e69 100644 GIT binary patch literal 3971 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 literal 639 zcmV-_0)YLAP)5lV3&)7?pCwvzNyYfP+G>#cbspssP>`<&aJah!@(5^nbg@J-E-nJ~$HEITCfs{%Mu z5ywzA2&&&{c9=Why)J{cO{ka{`}HC0peQUjSb2)|p;tLVMjZ`rW=OqF0V#CtF5%7#Oll6ijN*4Spg(z!Tu*PoHeyM6_W0u0 z{l1j1B6*bTqtP90yUw*x-n0zBk3k#j%O6il?up~RSaq#P;!KX09NNa~MeK~giYr)& z?VglGRiVgRIa6NE%;G5(kc&eyx^p8EyRT(nWKIG2)X|~kRC5@ioGjT!k!;CJQNDgA z`0!Om05lH`t(RF6P)KLZ*U+IBfRsybQWXdwQbLP>6pAqfylh#{fb6;Z(vMMVS~$e@S=j*ftg6;Uhf59&ghTmgWD0l;*T zI709Y^p6lP1rIRMx#05C~cW=H_Aw*bJ-5DT&Z2n+x)QHX^p z00esgV8|mQcmRZ%02D^@S3L16t`O%c004NIvOKvYIYoh62rY33S640`D9%Y2D-rV&neh&#Q1i z007~1e$oCcFS8neI|hJl{-P!B1ZZ9hpmq0)X0i`JwE&>$+E?>%_LC6RbVIkUx0b+_+BaR3cnT7Zv!AJxW zizFb)h!jyGOOZ85F;a?DAXP{m@;!0_IfqH8(HlgRxt7s3}k3K`kFu>>-2Q$QMFfPW!La{h336o>X zu_CMttHv6zR;&ZNiS=X8v3CR#fknUxHUxJ0uoBa_M6WNWeqIg~6QE69c9o#eyhGvpiOA@W-aonk<7r1(?fC{oI5N*U!4 zfg=2N-7=cNnjjOr{yriy6mMFgG#l znCF=fnQv8CDz++o6_Lscl}eQ+l^ZHARH>?_s@|##Rr6KLRFA1%Q+=*RRWnoLsR`7U zt5vFIcfW3@?wFpwUVxrVZ>QdQz32KIeJ}k~{cZZE^+ya? z2D1z#2HOnI7(B%_ac?{wFUQ;QQA1tBKtrWrm0_3Rgps+?Jfqb{jYbcQX~taRB;#$y zZN{S}1|}gUOHJxc?wV3fxuz+mJ4`!F$IZ;mqRrNsHJd##*D~ju=bP7?-?v~|cv>vB zsJ6IeNwVZxrdjT`yl#bBIa#GxRa#xMMy;K#CDyyGyQdMSxlWT#tDe?p!?5wT$+oGt z8L;Kp2HUQ-ZMJ=3XJQv;x5ci*?vuTfeY$;({XGW_huIFR9a(?@3)XSs8O^N5RyOM=TTmp(3=8^+zpz2r)C z^>JO{deZfso3oq3?Wo(Y?l$ge?uXo;%ru`Vo>?<<(8I_>;8Eq#KMS9gFl*neeosSB zfoHYnBQIkwkyowPu(zdms`p{<7e4kra-ZWq<2*OsGTvEV%s0Td$hXT+!*8Bnh2KMe zBmZRodjHV?r+_5^X9J0WL4jKW`}lf%A-|44I@@LTvf1rHjG(ze6+w@Jt%Bvjts!X0 z?2xS?_ve_-kiKB_KiJlZ$9G`c^=E@oNG)mWWaNo-3TIW8)$Hg0Ub-~8?KhvJ>$ z3*&nim@mj(aCxE5!t{lw7O5^0EIO7zOo&c6l<+|iDySBWCGrz@C5{St!X3hAA}`T4 z(TLbXTq+(;@<=L8dXnssyft|w#WSTW<++3>sgS%(4NTpeI-VAqb|7ssJvzNHgOZVu zaYCvgO_R1~>SyL=cFU|~g|hy|Zi}}s9+d~lYqOB71z9Z$wnC=pR9Yz4DhIM>Wmjgu z&56o6maCpC&F##y%G;1PobR9i?GnNg;gYtchD%p19a!eQtZF&3JaKv33gZ<8D~47E ztUS1iwkmDaPpj=$m#%)jCVEY4fnLGNg2A-`YwHVD3gv};>)hAvT~AmqS>Lr``i7kw zJ{5_It`yrBmlc25DBO7E8;5VoznR>Ww5hAaxn$2~(q`%A-YuS64wkBy=9dm`4cXeX z4c}I@?e+FW+b@^RDBHV(wnMq2zdX3SWv9u`%{xC-q*U}&`cyXV(%rRT*Z6MH?i+i& z_B8C(+grT%{XWUQ+f@NoP1R=AW&26{v-dx)iK^-Nmiuj8txj!m?Z*Ss1N{dh4z}01 z)YTo*JycSU)+_5r4#yw9{+;i4Ee$peRgIj+;v;ZGdF1K$3E%e~4LaI(jC-u%2h$&R z9cLXcYC@Xwnns&bn)_Q~Te?roKGD|d-g^8;+aC{{G(1^(O7m37Y1-+6)01cN&y1aw zoqc{T`P^XJqPBbIW6s}d4{z_f5Om?vMgNQEJG?v2T=KYd^0M3I6IZxbny)%vZR&LD zJpPl@Psh8QyPB@KTx+@RdcC!KX7}kEo;S|j^u2lU7XQ}Oo;f|;z4Ll+_r>@1-xl3| zawq-H%e&ckC+@AhPrP6BKT#_XdT7&;F71j}Joy zkC~6lh7E@6o;W@^IpRNZ{ptLtL(gQ-CY~4mqW;US7Zxvm_|@yz&e53Bp_lTPlfP|z zrTyx_>lv@x#=^!PzR7qqF<$gm`|ZJZ+;<)Cqu&ot2z=0000WV@Og>004R=004l4008;_004mL004C`008P>0026e000+nl3&F} z000E8Nkl;e#NO zS^`NUh6YU_X~bx-jfq;LNl74DArWgDZQ7b{(u86xw9uLqHXsBj1WduA>{^!X%T9M5 zKFo3Undx?CZF`cNd*?pqp8LP&oO|wnQod4MYTC(q?8i=1lSOzJLz5|GjZtcAa5;A1 zo;G?Vti_=KVQK&-2QeQDV*E=yiWw8=eFlHUMs#6zI{@V=x^rR6hPUHW_$@9*M|{5n zA1UZva-jfRHNo5$qfI6s`~O04c3I-wvET>N8Sy5m$t}TtS$HV-J-MG1;{QHIqVROK ztpB}=)lM3f%$9jp@+5i+~?UAtazqQLukHAc?uW1fJ z?rOPth0{)xT!gn8m6F|(ha_vT7Z0e}EmJk!ZECjQNZ5E;GFW()uWeYFQTNt(2y*k( zY>u-OuhD1mcW^pd=58I{khxFpH%U+|R) ziprCcrHvZ@e)Q8&F-yrJl-0bZ>Zn?{x1M_Q@DgSg?EXn|^EiNKklTR!Ct*ilmu!U$j4P5_&xp3@HTxoplzyTd?I^Na+DQGRgPe zV9ZyZW%Cb$4{kXhQhN9t8Sz1U8!w(OEq{B0xg+>*n{_{FxA{~(@UNBx+!&moJN_N@ zMMB-uc=_rT;^nEhX(|AY#s;s%^?Ekuhg-n)<2n2suj91~1>hL&jX$I#ZFGNuSK}Iv dO$ES*0|1t8F{yEo1>FDu002ovPDHLkV1fyFe?I^K delta 1325 zcmV+|1=9M1AHWKbB!2{RLP=Bz2nYy#2xN!=000SaNLh0L01FcU01FcV0GgZ_000Ey zNklF@4V;Yc06Zey3I{LP*8xdtF!3yREW{efu89Ex_liEN#ln__5dHan6W23JV7Yf@}Wm zda-iPf%<4)Oig{h-CG)Sv%l|8NU+ZaIe_7G>Rq1s<=fV+`0GO5<(ARDF%|InDoY!4 zbIuqJhnOw$(eQ)=@8NO<bVq^an22#)%T$TA1ygYpikf&}X?g>0iO+(Bf$eD9gxW zg=Yc5!+TJs`9zqM8$`d`ojFnBcF#469rv(fvC!t{UC$Mkj=IV5;Hd-;TeDUX{_bmJ zchr6o6o@{jGhw3SHIDA6ctxS3CvI}Pu(5M_F@K@fKQJ5W#)(ilVtA#F2fv&bV+)WN zw}8#rt4Kv4j~|^V#5>{0ooCarrM$}M-ccfx&G}nd?M|MOydXK9vPHRA$B&=}C;n`@ zGaOci%N0|F_p(;wuq()oVYpml>iSA*7AsRSFsk<=dm>mPSHUFo!)eSL%{=q^4pt?nQ+=z6 zJH`OndLIRj9{Qz=qU=rR1N~SvUrkXbtyA|74c)!x^(-4UEl*5hQ(hsV<42G^UE`)% zZ8tGK-i>?98&nr;;A;CftW&=*JWSQ#eSZc|TM&s%&M#@!Qv$~M7v{AuD|GbWR|ym@ zc@6X81tM2}n>1G$eu7_qhJF3B6qmHXllDdn-9~pS!c)Azf_nYUq8pma{v=!V`WQSH zyErC7{kXz@BZzEdap$J8I1+h}@1@J%3{b zqMck>(=en%?2;PCGAWFDMS=o7TSNIF*r>4XPm&;s2&L@@&=Kl$(5gnbgNktb^c1Kd z_-j?%%9T)umYzD-0U(l!*L|Q+JC&&}gj?l*Lp2KJpBDf0plH_Y!F|JzV+K%Ld1;<5 zxeQ|A9MSg(Y$Z!i{oFZh7;|^?Pk+?4gI)@3>;8nM$9xJi6~Sxj==ipHy_57f1+*WrFk}!Dy6Ym zXj6@s$Gl1!0_~)b+Ww{Ap6!?{Htt{Ho7-NV?+iws*QDHlpa4`3;C<}w2PUl(Nwb1_ j!wS}}tZ5jE=iL7RoiXchQ#?f{00000NkvXXu0mjfZK{!J diff --git a/src/img/fav_dark_16.png b/src/img/fav_dark_16.png new file mode 100644 index 0000000000000000000000000000000000000000..2f66c42db40ae33a18b48587dabee1b6442a4767 GIT binary patch literal 4837 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 N002ovPDHLkV1oY}ah(7F literal 0 HcmV?d00001 diff --git a/src/index.html b/src/index.html index 0274494c169..bf3a2179363 100644 --- a/src/index.html +++ b/src/index.html @@ -9,7 +9,7 @@ Grafana - + From 430e2e439b97cdd81897746a83e400f0dc5c6f62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Tue, 16 Sep 2014 13:32:27 +0200 Subject: [PATCH 10/10] Small fix to schemaUpgrade, Closes #807 --- src/app/services/dashboard/dashboardSrv.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/services/dashboard/dashboardSrv.js b/src/app/services/dashboard/dashboardSrv.js index 91587feda38..c6b386917ba 100644 --- a/src/app/services/dashboard/dashboardSrv.js +++ b/src/app/services/dashboard/dashboardSrv.js @@ -131,7 +131,7 @@ function (angular, $, kbn, _, moment) { if (old.services) { if (old.services.filter) { this.time = old.services.filter.time; - this.templating.list = old.services.filter.list; + this.templating.list = old.services.filter.list || []; } delete this.services; }