Commit Graph

1179 Commits

Author SHA1 Message Date
Björn Rabenstein 8b73bd904c
Merge pull request #823 from prometheus/beorn7/promhttp
promhttp: Correctly detect invalid metric and label names
2020-12-09 20:16:33 +01:00
beorn7 98eb6cbf7c promhttp: Correctly detect invalid metric and label names
Without this fix, the `InstrumentHandler...` middlewares get locked in
an endless loop in case of an invalid Collector, eating all the memory.

Signed-off-by: beorn7 <beorn@grafana.com>
2020-12-09 17:58:53 +01:00
Björn Rabenstein 37c26edd5b
Merge pull request #821 from prometheus/beorn7/multierror
Be more explicit about the multi-line properties of MultiError
2020-12-03 18:03:41 +01:00
beorn7 34ca120377 Be more explicit about the multi-line properties of MultiError
Signed-off-by: beorn7 <beorn@grafana.com>
2020-12-02 19:53:38 +01:00
Björn Rabenstein fd6d368676
Merge pull request #819 from jubalh/sp
Correct spelling: possibilites -> possibilities
2020-12-01 23:14:58 +01:00
Michael Vetter cf6dc82780 Correct spelling: possibilites -> possibilities
Signed-off-by: Michael Vetter <jubalh@iodoru.org>
2020-12-01 21:20:26 +01:00
Bartlomiej Plotka 39b478e90c
Added example api code showing how to add auth tokens and user agents to prom client. (#817)
* Added example api code showing how to add auth tokens and user agents to prom client.

Signed-off-by: Bartlomiej Plotka <bwplotka@gmail.com>

* Ran go mod tidy.

Signed-off-by: Bartlomiej Plotka <bwplotka@gmail.com>
2020-11-20 19:58:16 +00:00
Björn Rabenstein 06b1a0a6ae
Merge pull request #811 from prometheus/repo_sync
Synchronize common files from prometheus/prometheus
2020-11-04 15:37:38 +01:00
prombot c2caa7a1e9 Update common Prometheus files
Signed-off-by: prombot <prometheus-team@googlegroups.com>
2020-11-04 00:08:58 +00:00
Björn Rabenstein 2f1052bb66
Merge pull request #809 from prometheus/repo_sync
Synchronize common files from prometheus/prometheus
2020-10-23 12:51:20 +02:00
Björn Rabenstein f97b033d71
Merge pull request #804 from sbookworm/get_pid_from_file
add the NewPidFileFn to helper
2020-10-23 11:55:42 +02:00
sbookworm 469ec2747b add the NewPidFileFn to helper
Signed-off-by: sbookworm <lisong.cruise@gmail.com>
2020-10-23 09:23:59 +08:00
prombot aa8191ab24 Update common Prometheus files
Signed-off-by: prombot <prometheus-team@googlegroups.com>
2020-10-23 00:08:36 +00:00
Björn Rabenstein 47cfdc9bb8
Merge pull request #806 from prometheus/beorn7/release
Cut v1.8.0
2020-10-15 18:19:24 +02:00
beorn7 67f573aafe Cut v1.8.0
Signed-off-by: beorn7 <beorn@grafana.com>
2020-10-15 17:57:41 +02:00
beorn7 ded2474420 Update dependencies
Signed-off-by: beorn7 <beorn@grafana.com>
2020-10-15 17:57:41 +02:00
beorn7 3d1759b4c6 Run check for unused/missing Go packages only against latest Go version
The tidied up `go.mod` file tends to change between Go versions.

Signed-off-by: beorn7 <beorn@grafana.com>
2020-10-15 17:57:41 +02:00
Björn Rabenstein e6ea98bdda
Merge pull request #803 from prometheus/beorn7/vec
Export MetricVec (again)
2020-10-15 14:41:14 +02:00
beorn7 85aa957f63 Export MetricVec (again)
MetricVec was already exported in early versions of this library, but
nobody really used it to implement vectors of custom Metric
implementations. Now #796 has shown up with a fairly special use case
for which I'd prefer a custom implementation of a special
"auto-sampling histogram" outside of this library. Therefore, I'd like
to reinstate support for creating vectors of custom Metric
implementations.

I played around for quite some while with the option of a separate
package providing the tools one would need to create vectors of custom
Metric implementations. However, with the current structure of the
prometheus/client_golang/prometheus package, this leads to a lot of
complications with circular dependencies. (The new package would need
the primitives from the prometheus package, while the existing metric
vectors like GaugeVec need to import the new vector package to not
duplicate the implementation. Separating vector types from the main
prometheus package is out of the question at this point because that
would be a breaking change.)

Signed-off-by: beorn7 <beorn@grafana.com>
2020-10-15 14:32:54 +02:00
Björn Rabenstein 6007b2b5ca
Merge pull request #802 from prometheus/beorn7/fallback
API client: Enable fallback on status code 501, too
2020-09-10 16:16:53 +02:00
beorn7 64b4a9cf9d API client: Enable fallback on status code 501, too
When discussing #801, I remembered #794. While dealing with the
latter, I read the HTTP RFC, stumbling upon the following:

    When a request method is received
    that is unrecognized or not implemented by an origin server, the
    origin server SHOULD respond with the 501 (Not Implemented) status
    code.  When a request method is received that is known by an origin
    server but not allowed for the target resource, the origin server
    SHOULD respond with the 405 (Method Not Allowed) status code.

Concluding from that, it is possible that a server desiring a fallback
to GET will send a status code of 501. It is even preferred if that
server does not offer any resource to be used with the POST method.

Therefore, I think we should fallback to GET on a 501, too.

Signed-off-by: beorn7 <beorn@grafana.com>
2020-09-10 13:14:07 +02:00
Björn Rabenstein 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
beorn7 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
Björn Rabenstein 30ef25b84b
Merge pull request #797 from prometheus/repo_sync
Synchronize common files from prometheus/prometheus
2020-09-07 21:38:27 +02:00
prombot 64721be1b5 Update common Prometheus files
Signed-off-by: prombot <prometheus-team@googlegroups.com>
2020-09-03 00:08:53 +00:00
Björn Rabenstein 4675060215
Merge pull request #793 from johncming/stdlib-constant
Replace with the standard library constant.
2020-08-25 21:35:43 +02:00
johncming 32a545bf61 Replace with the standard library constant.
Signed-off-by: johncming <johncming@yahoo.com>
2020-08-22 19:36:13 +08:00
Björn Rabenstein aea1b33289
Merge pull request #792 from roidelapluie/go115
Support go 1.15
2020-08-17 20:24:24 +02:00
Julien Pivotto 8e5b4c249f Support go 1.15
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
2020-08-17 20:00:44 +02:00
Björn Rabenstein c650ae9fa1
Merge pull request #784 from hummerd/master
Remove reference to Metric after reslicing
2020-07-25 00:01:35 +02:00
Björn Rabenstein 77b35d0377
Merge pull request #783 from roidelapluie/gc15
Update collector comment about GC stop-the-world
2020-07-24 23:48:32 +02:00
Dima Kozlov 0c48254b62 remove reference to metrics after reslicing
Signed-off-by: Dima Kozlov <hummerd@mail.ru>
2020-07-22 23:12:23 +03:00
Julien Pivotto 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
Björn Rabenstein 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
Mitsuo Heijo 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
Maximilian Gaß 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
Hima Varsha 6cd29bd38a
Add support for tsdb endpoint (#773)
Signed-off-by: Hima Varsha <hdureddy@apple.com>
2020-06-24 12:35:25 +01:00
Björn Rabenstein fe7bd95816
Merge pull request #775 from prometheus/beorn7/release
Cut v1.7.1
2020-06-23 22:31:09 +02:00
beorn7 c5ba3869b1 Cut v1.7.1
Signed-off-by: beorn7 <beorn@grafana.com>
2020-06-23 20:16:09 +02:00
Björn Rabenstein ca603a880d
Merge pull request #774 from prometheus/repo_sync
Synchronize common files from prometheus/prometheus
2020-06-23 16:15:55 +02:00
prombot 2cbf08beaa Update common Prometheus files
Signed-off-by: prombot <prometheus-team@googlegroups.com>
2020-06-23 00:08:53 +00:00
Björn Rabenstein 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
Björn Rabenstein 023887914b
Merge pull request #772 from mhansen/patch-1
histogram.go: fix copy/paste typo
2020-06-22 10:36:28 +02:00
Mark Hansen 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
yeya24 94ae5774fd fix time parameter propagation in labels API
Signed-off-by: yeya24 <yb532204897@gmail.com>
2020-06-19 18:57:25 -04:00
Björn Rabenstein b05e50c929
Merge pull request #769 from prometheus/beorn7/release
Cut v1.7.0
2020-06-17 22:39:15 +02:00
beorn7 cc5731c16c Cut v1.7.0
Signed-off-by: beorn7 <beorn@grafana.com>
2020-06-16 21:13:43 +02:00
beorn7 3c8b15fa0d Update dependencies
Signed-off-by: beorn7 <beorn@grafana.com>
2020-06-16 20:57:28 +02:00
Björn Rabenstein c304bb07a6
Merge pull request #767 from Nexucis/feature/labelNames-parameter
add start/end parameter for LabelNames
2020-06-11 16:38:50 +02:00
Augustin Husson 3defbd9c7c add start/end parameter for LabelValues
Signed-off-by: Augustin Husson <husson.augustin@gmail.com>
2020-06-11 16:05:23 +02:00