github
/
prometheus
mirror of https://github.com/prometheus/prometheus
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Also fix label HTML-escaping in console graphs.

pull/610/head
Julius Volz 2015-03-22 23:47:00 +01:00
parent 8f6ef04d70
commit ea8a12db59
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
web/static/js/prom_console.js
View File

@ -386,6 +386,21 @@ PromConsole.Graph.prototype._parseValue = function(value) {
return val; return val;
} }
PromConsole.Graph.prototype._escapeHTML = function(string) {
var entityMap = {
"&": "&",
"<": "&lt;",
">": "&gt;",
'"': '&quot;',
"'": '&#39;',
"/": '&#x2F;'
};
return string.replace(/[&<>"'\/]/g, function (s) {
return entityMap[s];
});
}
PromConsole.Graph.prototype._render = function(data) { PromConsole.Graph.prototype._render = function(data) {
var self = this; var self = this;
var palette = new Rickshaw.Color.Palette(); var palette = new Rickshaw.Color.Palette();
@ -412,7 +427,7 @@ PromConsole.Graph.prototype._render = function(data) {
series[seriesLen++] = { series[seriesLen++] = {
data: data[e].value[i].values.map(function(s) {return {x: s[0], y: self._parseValue(s[1])} }), data: data[e].value[i].values.map(function(s) {return {x: s[0], y: self._parseValue(s[1])} }),
color: palette.color(), color: palette.color(),
name: nameFunc(data[e].value[i].metric), name: self._escapeHTML(nameFunc(data[e].value[i].metric)),
}; };
} }
} }
@ -530,7 +545,7 @@ PromConsole.Graph.prototype.dispatch = function() {
this.graphTd.appendChild(loadingImg); this.graphTd.appendChild(loadingImg);
}; };
// Substitue the value of 'label' for [[ label ]]. // Substitute the value of 'label' for [[ label ]].
PromConsole._interpolateName = function(name, metric) { PromConsole._interpolateName = function(name, metric) {
var re = /(.*?)\[\[\s*(\w+)+\s*\]\](.*?)/g; var re = /(.*?)\[\[\s*(\w+)+\s*\]\](.*?)/g;
var result = ''; var result = '';