4546 Commits

Author SHA1 Message Date
Conor Broderick
709e7fcbbe
Merge pull request #3565 from simonpasquier/update-openstack-sd-doc
Update the openstack_sd_config section
2017-12-12 14:15:58 +00:00
Simon Pasquier
6ee50afb09 Update the openstack_sd_config section
openstack_sd_config requires a 'role' parameter which wasn't documented.
2017-12-08 17:47:30 +01:00
Krasi Georgiev
a03e0248f5 example to show the difference between "sum by" and "sum without" (#3558) 2017-12-08 13:43:23 +00:00
Tobias Schmidt
cd973650d2
Merge pull request #3474 from prometheus/grobie/fix-wrong-alertmanager-url-docs
Remove wrong statement about alertmanager URL configuration
2017-11-14 22:52:31 +01:00
Tobias Schmidt
6608da7c72
Merge pull request #3473 from vthriller/patch-1
[minor] docs: recording_rules: fix missing key
2017-11-14 17:30:21 +01:00
vthriller
cf00e16837 [minor] docs: recording_rules: fix missing key 2017-11-14 19:27:21 +03:00
Tobias Schmidt
2bf2bcd48e Remove wrong statement about alertmanager URL configuration 2017-11-14 17:16:59 +01:00
Mike Rostermund
b3ddaf5ae9 New server uses read protocol, to eh, read. (#3444) 2017-11-09 01:44:05 +01:00
Brian Brazil
b225a0bf20
Document consul sd tls_config (#3440)
Fixes https://github.com/prometheus/docs/issues/681
2017-11-08 16:36:08 +00:00
Tobias Schmidt
584cc95246
Merge pull request #3433 from tomwilkie/migration-heading
'Prometheus lifecycle' should be a subsection of 'Miscellaneous'
2017-11-08 12:22:04 +01:00
Tom Wilkie
0aaa409cf9 'Prometheus lifecycle' should be a subsection of 'Miscellaneous' 2017-11-08 11:11:28 +00:00
Or Elimelech
f6cb3c79c1 Wrong URL for remote.proto (#3431)
Change wrong URL for remote.proto
2017-11-08 10:38:39 +00:00
phyber
6a92ccaaf9 Fix markdown in recording rules. (#3432)
Resolves an issue where rendered markdown was incorrect.
2017-11-08 10:38:03 +00:00
Tobias Schmidt
8f2ccbc2a2 Fix migration documentation title in docs menu 2017-11-08 10:04:00 +01:00
Brian Brazil
3a142f394b
Tweak migration doc (#3430) 2017-11-08 08:38:28 +00:00
Tobias Schmidt
e2135d671f
Merge pull request #3429 from josedonizetti/migration-guide-minor-text-changes
Small changes to migration guide
2017-11-08 09:20:52 +01:00
Jose Donizetti
45d561d81c Small changes to migration guide 2017-11-08 06:01:19 -02:00
Tobias Schmidt
6806b5fa2f Merge branch 'release-2.0' 2017-11-08 08:16:44 +01:00
Tom Wilkie
617e7d0203 Add migration docs for 2.0 (#3374)
* Initial draft of migration.md

* Edits.

* Review feedback.

* Review feedback.

* Staleness link to video; add docker root example; remote config file section.

* s/NB/NOTE/, remove external labels link.

* More typos.

* Add more details link for removed PromQL features.

* s/you/your/

* Expand on prom1.8/2.0 side by side setup.

* More feedback.

* update links.

* --query.lookback-delta flag.
2017-11-08 08:14:33 +01:00
Brian Brazil
0a74f98628 Release 2.0.0 v2.0.0 2017-11-08 08:06:15 +01:00
Julius Volz
02ca988bbd Remove /api/v1/delete_series docs for 2.0 (#3425)
This endpoint has moved to /api/v2 (with somewhat different properties)
in Prometheus 2.0 and should now be part of a separate admin API page.
2017-11-07 22:37:03 +00:00
Tobias Schmidt
a117f051da Remove outdated information about next-release doc branch 2017-11-07 22:28:04 +01:00
Julius Volz
ef08df0e6f
Add 2.0 storage docs (#3423)
* Add 2.0 storage docs

* Review fixups

* More review fixups
2017-11-07 22:00:38 +01:00
Matthew Pound
e6dcc72f9a Fix instructions on updating prometheus.yml for Remote Write Adapter Example (#3422) 2017-11-07 20:02:43 +00:00
Krasi Georgiev
08a012ccd7 Fix for #3312 sigpanic in TargetManager (#3420) 2017-11-07 15:56:00 +00:00
Brian Brazil
f689476b33
Update consoles for new metric names. (#3327) 2017-11-07 13:23:45 +00:00
Bora Tunca
e63219ae6a Add discovery test (#3417) 2017-11-06 17:33:52 +00:00
Bora Tunca
09be10a553 Add test to prove redundant calls to identical target providers (#3404) 2017-11-06 16:14:15 +00:00
James Turnbull
4db6592d01 Removing external_labels from example conf file (#3409)
It's unclear why this is in the example configuration file. Probably best to keep that super simple, c.f. https://github.com/prometheus/docs/pull/895#discussion_r148924390
2017-11-06 16:11:04 +00:00
Sylvain Rabot
db5b1aa5f6 Makefile: Allow $(GO) to be set with environmental variable (#2919)
* promu: Use same go invocation as prometheus' for building

If you override $(GO) var in prometheus Makefile in order to use
a custom go binary you might encounter errors while building promu
as promu's Makefile $(GO) var is also defined to look for go in the
$PATH and you might end up using different go binaries for building
prometheus and promu.

This patch makes prometheus Makefile pass its $(GO) var to promu's makefile
as environmental variable.

Signed-off-by: Sylvain Rabot <s.rabot@lectra.com>

* Makefile: Allow $(GO) to be set with environmental variable

Signed-off-by: Sylvain Rabot <s.rabot@lectra.com>

* Makefile: Fix hardcoded call to gofmt

Signed-off-by: Sylvain Rabot <s.rabot@lectra.com>
2017-11-06 15:55:43 +01:00
David
e3b926c03b Fix typo in AM config field static_configs (#3415)
* typo in prometheus.yml field causes prometheus to throw an error

Fixes #3414
2017-11-06 09:46:09 +00:00
Björn Rabenstein
8a9b32d0eb
Merge pull request #3410 from prometheus/beorn7/release
Cut 2.0.0-rc.3
v2.0.0-rc.3
2017-11-04 21:26:05 +01:00
beorn7
36a6ed4fe1 Cut v2.0.0-rc.3 2017-11-04 19:31:20 +01:00
beorn7
463faf5816 Ignore staticcheck's SA1019 in discovery/kubernetes/kubernetes.go, too
This showed up all of a sudden, even if checking out older commits.
2017-11-04 17:41:39 +01:00
beorn7
139929a363 Update vendoring of prometheus/tsdb and prometheus/common 2017-11-04 17:26:17 +01:00
beorn7
348ea482ea Merge branch 'beorn7/release' 2017-11-04 12:32:49 +01:00
beorn7
d7e9cca287 Cut 1.8.2 2017-11-04 11:49:35 +01:00
Björn Rabenstein
bf8e002fce
Merge pull request #3405 from dominikschulz/fix/issue-3001
Guard against tags being nil in EC2 discovery
2017-11-03 17:20:40 +01:00
Dominik Schulz
a731a43302 Guard against tags being nil in EC2 discovery
Fixes #3001
2017-11-03 13:23:01 +01:00
Björn Rabenstein
1829681e84
Merge pull request #3400 from prometheus/beorn7/release
Update vendoring for tsdb and clean it up in general
2017-11-03 13:09:19 +01:00
Björn Rabenstein
c686f40adf
Merge pull request #3396 from prometheus/beorn7/doc
Remove @beorn7 from MAINTAINERS.md, promote @fabxc to storage maintainer
2017-11-03 12:56:16 +01:00
beorn7
d8c58d17e0 Remove _local storage_ from fabxc's responsibilities again
This is just for now, as fabxc doesn't seem to be available to agree
to his new role. Just revert this commit once he has.
2017-11-03 12:52:24 +01:00
beorn7
8093122782 Clean up vendoring
This doesn't perform any actual updates. (While that is something that
we should consider eventually, it leads down a rabbit hole and would
be too risky just before the 2.0.0 release.)

This is really just a clean-up. In particular:

- The following packages are not really used and thus removed:
  - github.com/blang/semver
  - github.com/coreos/go-oidc/http
  - github.com/coreos/go-oidc/jose
  - github.com/coreos/go-oidc/key
  - github.com/coreos/go-oidc/oauth2
  - github.com/coreos/go-oidc/oidc
  - github.com/coreos/pkg/health
  - github.com/coreos/pkg/httputil
  - github.com/coreos/pkg/timeutil
  - github.com/gophercloud/gophercloud/openstack/compute/v2/extensions
  - github.com/pborman/uuid

- For unclear reasons, the checksum for the following packages were
  wrong. The only change in this commit is to adjust the checksum in
  vendor.json. No changes of source code involved.
  - github.com/cespare/xxhash
  - github.com/dgryski/go-bits
  - github.com/golang/snappy

- Various packages from the github.com/gogo/protobuf repository are
  used throughout the code. They are vendored from various sources
  (different sub-vendoring of cockroachdb/cockroach and
  k8s.io/client-go) and revisions. I made them all consistently
  referring to the current version of the github.com/gogo/protobuf
  repository. This _is_ a change of code, but a necessary one to clean
  up the inconsistencies.

- For the github.com/influxdata/influxdb/... packages, the license
  files were missing. Also, the revision time was wrong, again for
  unknown reason.

This tries to avoid any real updates (as that would lead down a rabbit
hole, although I think we should check what dependencies need an
update one day) but at least tries to remove unused packages.
2017-11-02 17:50:00 +01:00
beorn7
e4167a5ca8 Update vendoring of prometheus/tsdb 2017-11-02 17:12:26 +01:00
beorn7
2121b4628b Update NOTICE for gogo/protobuf 2017-11-02 15:28:47 +01:00
Björn Rabenstein
7ff9ea9ae3
Merge pull request #3394 from krasi-georgiev/gogo-vs-golang-protobuf
replace golang/protobuf with  gogo/protobuf
2017-11-02 15:26:27 +01:00
Björn Rabenstein
fe3cde2d50
Merge pull request #3392 from krasi-georgiev/updated-gitignore
updated-gitignore
2017-11-02 15:25:14 +01:00
Björn Rabenstein
35507d9e9a
Merge pull request #3398 from prometheus/marathon-docs
Tweak marathon wording around clustering.
2017-11-02 15:17:59 +01:00
Brian Brazil
a5b7955ace Tweak marathon wording around clustering. 2017-11-02 13:03:19 +00:00
Krasi Georgiev
5d8f93a22a now using only github.com/gogo/protobuf
bumped all grpc-gateway packages to v1.2.2
updated and run  the denproto.sh script
2017-11-02 11:31:57 +00:00