IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:grafana/grafana

Browse Source
This commit is contained in:
Torkel Ödegaard
2016-07-12 15:55:10 +02:00
parent 4bb4d7f7d3 383b313027
commit cc5c45112a
5 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
CHANGELOG.md
View File

@@ -6,10 +6,12 @@
* **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
### 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)

4
latest.json
View File

@@ -1,4 +1,4 @@
{
"stable": "3.0.4",
"testing": "3.1.0-beta1"
"stable": "3.1.0",
"testing": "3.1.0"
}

15
packaging/rpm/init.d/grafana-server
View File

@@ -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
;;

2
public/app/plugins/datasource/elasticsearch/datasource.js
View File

@@ -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};

2
public/app/plugins/panel/table/module.ts
View File

@@ -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());
}