mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2025-01-27 05:32:27 -08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge pull request #1841 from prometheus/beorn7/release

Browse source 
Cut release 1.0.1
This commit is contained in:
Björn Rabenstein 2016-07-21 14:51:05 +02:00 committed by GitHub
parent bf6201483c 4ff4857112
commit be4019065c
5 changed files with 56 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
CHANGELOG.md
View file

@ -1,3 +1,9 @@
## 1.0.1 / 2016-07-21
* [BUGFIX] Exit with error on non-flag command-line arguments.
* [BUGFIX] Update example console templates to new HTTP API.
* [BUGFIX] Re-add logging flags.
## 1.0.0 / 2016-07-18
* [CHANGE] Remove deprecated query language keywords

2
VERSION
View file

@ -1 +1 @@
1.0.0
1.0.1

5
cmd/prometheus/config.go
View file

@ -245,10 +245,13 @@ func init() {
func parse(args []string) error {
err := cfg.fs.Parse(args)
if err != nil {
if err != nil || len(cfg.fs.Args()) != 0 {
if err != flag.ErrHelp {
log.Errorf("Invalid command line arguments. Help: %s -h", os.Args[0])
}
if err == nil {
err = fmt.Errorf("Non-flag argument on command line: %q", cfg.fs.Args()[0])
}
return err
}

74
web/ui/bindata.go
View file

File diff suppressed because one or more lines are too long

16
web/ui/static/js/prom_console.js
View file

@ -438,11 +438,11 @@ PromConsole.Graph.prototype._render = function(data) {
// Get the data into the right format.
var seriesLen = 0;
for (var e = 0; e < data.length; e++) {
for (var i = 0; i < data[e].value.length; i++) {
for (var i = 0; i < data[e].data.result.length; i++) {
series[seriesLen++] = {
data: data[e].value[i].values.map(function(s) { return {x: s[0], y: self._parseValue(s[1])}; }),
data: data[e].data.result[i].values.map(function(s) { return {x: s[0], y: self._parseValue(s[1])}; }),
color: palette.color(),
name: self._escapeHTML(nameFuncs[e](data[e].value[i].metric)),
name: self._escapeHTML(nameFuncs[e](data[e].data.result[i].metric)),
};
}
}
@ -519,9 +519,9 @@ PromConsole.Graph.prototype.dispatch = function() {
var pending_requests = this.params.expr.length;
for (var i = 0; i < this.params.expr.length; ++i) {
var endTime = this.params.endTime;
var url = PATH_PREFIX + "/api/query_range?expr=" + encodeURIComponent(this.params.expr[i]) +
var url = PATH_PREFIX + "/api/v1/query_range?query=" + encodeURIComponent(this.params.expr[i]) +
"&step=" + this.params.duration / this.graphTd.offsetWidth +
"&range=" + this.params.duration + "&end=" + endTime;
"&start=" + (endTime - this.params.duration) + "&end=" + endTime;
var xhr = new XMLHttpRequest();
xhr.open('get', url, true);
xhr.responseType = 'json';
@ -596,12 +596,12 @@ PromConsole._chooseNameFunction = function(data) {
// If only one label varies, use that value.
var labelValues = {};
for (var e = 0; e < data.length; e++) {
for (var i = 0; i < data[e].value.length; i++) {
for (var label in data[e].value[i].metric) {
for (var i = 0; i < data[e].data.result.length; i++) {
for (var label in data[e].data.result[i].metric) {
if (!(label in labelValues)) {
labelValues[label] = {};
}
labelValues[label][data[e].value[i].metric[label]] = 1;
labelValues[label][data[e].data.result[i].metric[label]] = 1;
}
}
}