65c5578b2d
Merge pull request #800 from prometheus/beorn7/doc
...
Remove spurious commas from links to the docs site
2020-09-08 12:19:54 +02:00
b54b73c7b1
Remove spurious commas from links to the docs site
...
I assume older Nanoc versions rendered the anchors with commas, but
the current doesn't.
Also, this adds the same link to another doc comment where it is also
relevant.
Signed-off-by: beorn7 <beorn@grafana.com>
2020-09-07 22:31:29 +02:00
30ef25b84b
Merge pull request #797 from prometheus/repo_sync
...
Synchronize common files from prometheus/prometheus
2020-09-07 21:38:27 +02:00
64721be1b5
Update common Prometheus files
...
Signed-off-by: prombot <prometheus-team@googlegroups.com>
2020-09-03 00:08:53 +00:00
4675060215
Merge pull request #793 from johncming/stdlib-constant
...
Replace with the standard library constant.
2020-08-25 21:35:43 +02:00
32a545bf61
Replace with the standard library constant.
...
Signed-off-by: johncming <johncming@yahoo.com>
2020-08-22 19:36:13 +08:00
aea1b33289
Merge pull request #792 from roidelapluie/go115
...
Support go 1.15
2020-08-17 20:24:24 +02:00
8e5b4c249f
Support go 1.15
...
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
2020-08-17 20:00:44 +02:00
c650ae9fa1
Merge pull request #784 from hummerd/master
...
Remove reference to Metric after reslicing
2020-07-25 00:01:35 +02:00
77b35d0377
Merge pull request #783 from roidelapluie/gc15
...
Update collector comment about GC stop-the-world
2020-07-24 23:48:32 +02:00
0c48254b62
remove reference to metrics after reslicing
...
Signed-off-by: Dima Kozlov <hummerd@mail.ru>
2020-07-22 23:12:23 +03:00
4759649876
Update collector comment about GC stop-the-world
...
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
2020-07-22 01:42:37 +02:00
d3accfda21
Merge pull request #779 from johejo/fix_tests_string_type_conversions
...
fix tests warning about string(int) type conversions
2020-07-06 15:16:39 +02:00
916659fee0
fix tests warning about string(int) type conversions
...
See https://github.com/golang/go/issues/32479
Signed-off-by: Mitsuo Heijo <mitsuo.heijo@gmail.com>
2020-07-06 21:19:31 +09:00
b0cdec211b
Use time.Time for timestamps in Runtimeinfo ( #777 )
...
Signed-off-by: Maximilian Gaß <m.gass@babiel.com>
2020-06-24 16:55:36 +01:00
6cd29bd38a
Add support for tsdb endpoint ( #773 )
...
Signed-off-by: Hima Varsha <hdureddy@apple.com>
2020-06-24 12:35:25 +01:00
fe7bd95816
Merge pull request #775 from prometheus/beorn7/release
...
Cut v1.7.1
2020-06-23 22:31:09 +02:00
c5ba3869b1
Cut v1.7.1
...
Signed-off-by: beorn7 <beorn@grafana.com>
2020-06-23 20:16:09 +02:00
ca603a880d
Merge pull request #774 from prometheus/repo_sync
...
Synchronize common files from prometheus/prometheus
2020-06-23 16:15:55 +02:00
2cbf08beaa
Update common Prometheus files
...
Signed-off-by: prombot <prometheus-team@googlegroups.com>
2020-06-23 00:08:53 +00:00
3df22a4779
Merge pull request #771 from yeya24/fix-time-range-propagation
...
Fix time parameter propagation in labels API
2020-06-22 18:35:43 +02:00
023887914b
Merge pull request #772 from mhansen/patch-1
...
histogram.go: fix copy/paste typo
2020-06-22 10:36:28 +02:00
7687ac2137
histogram.go: fix copy/paste typo
...
This method calls NewConstHistogram.
Signed-off-by: Mark Hansen <mark@markhansen.co.nz>
2020-06-21 13:47:29 +10:00
94ae5774fd
fix time parameter propagation in labels API
...
Signed-off-by: yeya24 <yb532204897@gmail.com>
2020-06-19 18:57:25 -04:00
b05e50c929
Merge pull request #769 from prometheus/beorn7/release
...
Cut v1.7.0
2020-06-17 22:39:15 +02:00
cc5731c16c
Cut v1.7.0
...
Signed-off-by: beorn7 <beorn@grafana.com>
2020-06-16 21:13:43 +02:00
3c8b15fa0d
Update dependencies
...
Signed-off-by: beorn7 <beorn@grafana.com>
2020-06-16 20:57:28 +02:00
c304bb07a6
Merge pull request #767 from Nexucis/feature/labelNames-parameter
...
add start/end parameter for LabelNames
2020-06-11 16:38:50 +02:00
3defbd9c7c
add start/end parameter for LabelValues
...
Signed-off-by: Augustin Husson <husson.augustin@gmail.com>
2020-06-11 16:05:23 +02:00
6ce5f2ca8a
add start/end parameter for LabelNames
...
Signed-off-by: Augustin Husson <husson.augustin@gmail.com>
2020-06-11 13:02:32 +02:00
03575cad4e
Merge pull request #764 from prometheus/wrap-nil
...
Ensure that nil registers are treat as a no-op, even when wrapping.
2020-06-04 13:01:48 +02:00
9c8ba1f945
Review feedback: add comment and tests for WrapRegistererWith.
...
Signed-off-by: Tom Wilkie <tom.wilkie@gmail.com>
2020-06-04 11:51:51 +01:00
614377c550
Review feedback: use one line.
...
Signed-off-by: Tom Wilkie <tom.wilkie@gmail.com>
2020-06-04 10:57:40 +01:00
8961609f91
Ensure that nil registers are treat as a no-op, even when wrapping.
...
Signed-off-by: Tom Wilkie <tom.wilkie@gmail.com>
2020-06-04 10:30:51 +01:00
84c6b9db90
Merge pull request #762 from prometheus/beorn7/doc
...
Improve doc comments in promauto
2020-06-03 14:18:14 +02:00
3ba240a80f
Improve doc comments in promauto
...
In particular, point out that `With(nil)` is valid.
Signed-off-by: beorn7 <beorn@grafana.com>
2020-06-03 13:56:49 +02:00
056e8af303
Merge pull request #755 from lilic/add-runtimeinfo
...
api/prometheus/v1/api.go: Add support for status/runtimeinfo endpoint
2020-06-03 13:17:52 +02:00
59508bb79c
Merge pull request #761 from prometheus/mdl-kelvin
...
testutil/promlint: allow Kelvin as a base unit for color temperature
2020-06-02 18:06:07 +02:00
3afa5ab1e1
testutil/promlint: allow Kelvin as a base unit for color temperature
...
Signed-off-by: Matt Layher <mdlayher@gmail.com>
2020-05-28 11:54:54 -04:00
3bb96180b6
Merge pull request #756 from prometheus/makefile_common
...
Synchronize Makefile.common from prometheus/prometheus
2020-05-19 14:38:55 +02:00
150f9212ff
Merge pull request #757 from RainbowMango/pr_bump_golang_protobuf_14_2
...
Bump github.com/golang/protobuf to v1.4.2
2020-05-19 14:28:05 +02:00
93cac27dd5
Bump github.com/golang/protobuf to v1.4.2
...
Signed-off-by: RainbowMango <renhongcai@huawei.com>
2020-05-19 11:40:21 +08:00
6090117ca1
makefile: update Makefile.common with newer version
...
Signed-off-by: prombot <prometheus-team@googlegroups.com>
2020-05-19 00:08:43 +00:00
6c43f2ebc2
api/prometheus/v1/api_test.go: Add test case for runtimeinfo endpoint
...
Signed-off-by: Lili Cosic <cosiclili@gmail.com>
2020-05-18 20:12:53 +02:00
c9e3c020a9
api/prometheus/v1/api.go: Add support for /runtimeinfo endpoint
...
Signed-off-by: Lili Cosic <cosiclili@gmail.com>
2020-05-18 20:12:53 +02:00
bff02dd561
Merge pull request #754 from prometheus/beorn7/deprecation
...
Add lint:ignore for protobuf deprecation
2020-05-18 15:31:02 +02:00
d8b51d4981
Merge pull request #753 from prometheus/beorn7/test
...
Improve CollectAndCount
2020-05-15 13:19:43 +02:00
dba1478b8a
Add lint:ignore for protobuf deprecation
...
`github.com/golang/protobuf/proto` is deprecated in lieu of
`google.golang.org/protobuf/proto`. However, we cannot simply
migrate. Types from the proto package are exposed to users of packages
in this repo. If we migrate here, users have to migrate to. Thus, we
could only migrate with a major version bump.
In different news, with all the inline lint:ignore comments, including
the existing ones, there is no need to repeat the exception in the
Makefile.
A current version of `staticcheck` is happy with the code after this
commit. golangci-lint is broken at the moment, however, and ignores
the lint:ignore comments in the code as well as those via envvar.
Signed-off-by: beorn7 <beorn@grafana.com>
2020-05-14 20:11:22 +02:00
ef4f0376f5
Merge pull request #752 from prometheus/beorn7/push
...
Properly handle empty job and label values
2020-05-14 18:57:43 +02:00
0577ef6c57
Improve CollectAndCount
...
Now that we have also added CollectAndLint and GatherAndLint, I
thought we should bring CollectAndCount in line. So:
- Add GatherAndCount.
- Add filtering by metric name.
- Add tests.
Minor wart: CollectAndCount should now return `(int, error)`, but that
would be a breaking change as the current version just returns
`int`. I decided to let the new version panic when it should return an
error. An error is anyway very unlikely, so the biggest annoyance here
is really just the inconsistency.
Signed-off-by: beorn7 <beorn@grafana.com>
2020-05-14 00:17:45 +02:00
Björn Rabenstein