From 010dbddf5933fdd2034e259ad8d49692203d2d9b Mon Sep 17 00:00:00 2001 From: Alexander Akulov Date: Fri, 8 Jul 2016 21:24:08 +0500 Subject: [PATCH 1/6] Fix double slashes in POST request to ES (#5536) --- public/app/plugins/datasource/elasticsearch/datasource.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/app/plugins/datasource/elasticsearch/datasource.js b/public/app/plugins/datasource/elasticsearch/datasource.js index 2e3d36c2925..c952bf4d4f6 100644 --- a/public/app/plugins/datasource/elasticsearch/datasource.js +++ b/public/app/plugins/datasource/elasticsearch/datasource.js @@ -256,7 +256,7 @@ function (angular, _, moment, kbn, ElasticQueryBuilder, IndexPattern, ElasticRes esQuery = esQuery.replace(/\$timeTo/g, range.to.valueOf()); esQuery = header + '\n' + esQuery + '\n'; - return this._post('/_msearch?search_type=count', esQuery).then(function(res) { + return this._post('_msearch?search_type=count', esQuery).then(function(res) { var buckets = res.responses[0].aggregations["1"].buckets; return _.map(buckets, function(bucket) { return {text: bucket.key, value: bucket.key}; From e518f50248163e82251e78f97f260ea6df5f2352 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Mon, 11 Jul 2016 10:09:49 +0200 Subject: [PATCH 2/6] docs(): updated changelog --- CHANGELOG.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 368a8da5b34..917d9b7fda8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,8 +8,10 @@ # 3.1.0 stable (unreleased) -### Bugfixes +### Bugfixes & Enhancements, * **User Alert Notices**: Backend error alert popups did not show properly, fixes [#5435](https://github.com/grafana/grafana/issues/5435) +* **Table**: Added sanitize HTML option to allow links in table cells, fixes [#4596](https://github.com/grafana/grafana/issues/4596) +* **Apps**: App dashboards are automatically synced to DB at startup after plugin update, fixes [#5529](https://github.com/grafana/grafana/issues/5529) # 3.1.0-beta1 (2016-06-23) From 9055beff1a89aa8743ab27dc4078359940080aee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Mon, 11 Jul 2016 11:09:20 +0200 Subject: [PATCH 3/6] fix(table): fixed merge issue --- public/app/plugins/panel/table/module.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/app/plugins/panel/table/module.ts b/public/app/plugins/panel/table/module.ts index 402203204bd..86847a01aac 100644 --- a/public/app/plugins/panel/table/module.ts +++ b/public/app/plugins/panel/table/module.ts @@ -139,7 +139,7 @@ class TablePanelCtrl extends MetricsPanelCtrl { } exportCsv() { - var renderer = new TableRenderer(this.panel, this.table, this.dashboard.isTimezoneUtc()); + var renderer = new TableRenderer(this.panel, this.table, this.dashboard.isTimezoneUtc(), this.$sanitize); FileExport.exportTableDataToCsv(renderer.render_values()); } From eafb0f32481e280c656c1bc91ee55cc252bd5fb8 Mon Sep 17 00:00:00 2001 From: Bryan Irvine Date: Mon, 11 Jul 2016 06:23:39 -0700 Subject: [PATCH 4/6] get rid of weird line breaks and use action (#4926) * get rid of weird line breaks and use action When using restarts/stops/starts you'd get weird output sometimes, Strange line breaks 'OK' status overlapping the next lines etc... This fixes those moves OK to the right place and colorizes them correctly. * added : for more uniformity when doing a restart the output looked like: Stopping Grafana Server ... [ OK ] Starting Grafana Server: ... [ OK ] The Stopping line did not have a colon. I added it just to make it look better. --- packaging/rpm/init.d/grafana-server | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/packaging/rpm/init.d/grafana-server b/packaging/rpm/init.d/grafana-server index c60f4fb6080..cb9bb73de7d 100755 --- a/packaging/rpm/init.d/grafana-server +++ b/packaging/rpm/init.d/grafana-server @@ -72,8 +72,6 @@ function isRunning() { case "$1" in start) - echo -n $"Starting $DESC: .... " - isRunning if [ $? -eq 0 ]; then echo "Already running." @@ -90,7 +88,7 @@ case "$1" in # Start Daemon cd $GRAFANA_HOME - su -s /bin/sh -c "nohup ${DAEMON} ${DAEMON_OPTS} >> /dev/null 3>&1 &" $GRAFANA_USER 2> /dev/null + action $"Starting $DESC: ..." su -s /bin/sh -c "nohup ${DAEMON} ${DAEMON_OPTS} >> /dev/null 3>&1 &" $GRAFANA_USER 2> /dev/null return=$? if [ $return -eq 0 ] then @@ -114,26 +112,25 @@ case "$1" in done fi - echo "OK" exit $return ;; stop) - echo -n "Stopping $DESC ..." + echo -n "Stopping $DESC: ..." if [ -f "$PID_FILE" ]; then killproc -p $PID_FILE -d 20 $NAME if [ $? -eq 1 ]; then - echo -n "$DESC is not running but pid file exists, cleaning up" + echo "$DESC is not running but pid file exists, cleaning up" elif [ $? -eq 3 ]; then PID="`cat $PID_FILE`" - echo -n "Failed to stop $DESC (pid $PID)" + echo "Failed to stop $DESC (pid $PID)" exit 1 fi rm -f "$PID_FILE" - echo "OK" + echo "" exit 0 else - echo -n "(not running)" + echo "(not running)" fi exit 0 ;; From 0f9f903e09c0ba2098d73a5016ab39f7ee123329 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Tue, 12 Jul 2016 15:16:46 +0200 Subject: [PATCH 5/6] Update latest.json --- latest.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/latest.json b/latest.json index e18c220a7b0..f27001ccc41 100644 --- a/latest.json +++ b/latest.json @@ -1,4 +1,4 @@ { - "stable": "3.0.4", - "testing": "3.1.0-beta1" + "stable": "3.1.0", + "testing": "3.1.0" } From 383b3130278fd1f6428f0b9eb1b03fe12164d378 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Tue, 12 Jul 2016 15:17:04 +0200 Subject: [PATCH 6/6] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 917d9b7fda8..1a66686fea5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,7 @@ * **Localization**: Week start day now dependant on browser locale setting, closes [#3003](https://github.com/grafana/grafana/issues/3003) * **Templating**: Update panel repeats for variables that change on time refresh, closes [#5021](https://github.com/grafana/grafana/issues/5021) -# 3.1.0 stable (unreleased) +# 3.1.0 stable (2016-07-12) ### Bugfixes & Enhancements, * **User Alert Notices**: Backend error alert popups did not show properly, fixes [#5435](https://github.com/grafana/grafana/issues/5435)