c2e3855f3b
Minimal “fix” for hash collisions
...
This makes the collisions a bit less likely by XOR'ing descIDs rather
than adding them up for the collectorID.
Signed-off-by: beorn7 <beorn@grafana.com>
2019-10-14 20:14:43 +02:00
bf9ff715fe
Expose bug #633
...
Signed-off-by: beorn7 <beorn@grafana.com>
2019-10-14 20:02:58 +02:00
6fa429cf42
Unflake TestGoCollectorGoroutines
...
This is not a great solution, but it's also hard to test for this
moving target.
Signed-off-by: beorn7 <beorn@grafana.com>
2019-10-14 19:44:28 +02:00
bd362a9ced
Use HTTP status code constants rather than numerical literals
...
Signed-off-by: beorn7 <beorn@grafana.com>
2019-10-14 19:27:09 +02:00
f24de70161
Update push test to use status code 200
...
Signed-off-by: beorn7 <beorn@grafana.com>
2019-10-14 19:24:20 +02:00
3ddc3cfbe5
Merge pull request #652 from ahjdzx/fix_status_code
...
Fix check status code
2019-10-12 14:49:42 +02:00
7c6a9d7568
Fix check status code
...
Signed-off-by: Xin Zhang <ahjdzx1990@gmail.com>
2019-10-12 16:08:00 +08:00
9a37535b1b
Merge pull request #646 from prometheus/beorn7/modules
...
Update dependencies
2019-10-02 12:23:08 +02:00
49b3f23433
remove duplicated assignment in v1/api.go ( #647 )
...
Signed-off-by: Guangming Wang <guangming.wang@daocloud.io>
2019-10-02 00:47:28 +03:00
eb4edc4474
Update dependencies
...
This should happen now and then anyway, but in this case, it should
also fix #642 .
Signed-off-by: beorn7 <beorn@grafana.com>
2019-09-27 21:09:48 +02:00
20428fa0bf
Merge pull request #639 from simonpasquier/bump-golang-1.13
...
Enable Go 1.13
2019-09-13 12:31:02 +02:00
94166ecec9
Enable Go 1.13
...
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
2019-09-13 12:13:46 +02:00
7cf0ee13b0
Merge pull request #638 from prometheus/makefile_common
...
Synchronize Makefile.common from prometheus/prometheus
2019-09-11 11:57:14 +02:00
bc20938140
makefile: update Makefile.common with newer version
...
Signed-off-by: prombot <prometheus-team@googlegroups.com>
2019-09-11 00:08:33 +00:00
b4781a8cbd
Merge pull request #635 from prometheus/makefile_common
...
Synchronize Makefile.common from prometheus/prometheus
2019-08-30 13:28:58 +02:00
330bc3b046
makefile: update Makefile.common with newer version
...
Signed-off-by: prombot <prometheus-team@googlegroups.com>
2019-08-30 00:08:28 +00:00
35ef65db67
Merge pull request #634 from prometheus/beorn7/promhttp
...
Add WriteHeader call to Flush
2019-08-20 10:35:54 +02:00
ad58180fde
Add WriteHeader call to Flush
...
Flush is another of the methods that will call WriteHeader if it
hasn't happened yet. Since we want to call observeWriteHeader (if
set), we need to do the WriteHeader call already here, similar to what
we have done in Write and ReadFrom.
This commit also adds comments explaining the above to not tempt
developers to remove the WriteHeader call.
Signed-off-by: beorn7 <beorn@grafana.com>
2019-08-19 18:19:23 +02:00
4efc3ccc7a
Merge pull request #632 from painhardcore/master
...
Fix typo in documentation.
2019-08-13 13:46:04 +02:00
b0bcec8f2e
Fix typo in documentation
...
Signed-off-by: Andrey Yurchenkov <painhardcore@gmail.com>
2019-08-13 13:43:39 +03:00
b7953aabc6
Merge pull request #631 from prometheus/beorn7/doc
...
Update beorn's e-mail and add GH handles
2019-08-12 23:58:09 +02:00
d0ebb8fd05
Update beorn's e-mail and add GH handles
...
Signed-off-by: beorn7 <beorn@grafana.com>
2019-08-12 17:46:22 +02:00
801fabc446
Merge pull request #630 from csmarchbanks/api-examples
...
Provide godoc examples for using the api
2019-08-09 23:23:17 +02:00
48fdc3021b
Provide godoc examples for using the api
...
Closes #194
Signed-off-by: Chris Marchbanks <csmarchbanks@gmail.com>
2019-08-07 20:53:38 -06:00
170205fb58
Merge pull request #629 from prometheus/beorn7/release
...
Cut 1.1.0
2019-08-01 15:37:03 +02:00
8b8fbc929b
Cut 1.1.0
...
Signed-off-by: beorn7 <beorn@grafana.com>
2019-08-01 14:23:24 +02:00
2bb70fc592
Update Go modules
...
Signed-off-by: beorn7 <beorn@grafana.com>
2019-08-01 14:17:16 +02:00
c0dfcd145f
Merge pull request #628 from tariq1890/docker
...
add minor Dockerfile improvements
2019-07-31 18:24:48 +02:00
8977247c4e
add minor Dockerfile improvements
...
Signed-off-by: Tariq Ibrahim <tariq181290@gmail.com>
2019-07-31 09:13:29 -07:00
8bb84c10f1
Merge pull request #627 from prometheus/beorn7/modules
...
Update .gitignore
2019-07-30 23:26:25 +02:00
5d286d7120
Update .gitignore
...
Inspired by
https://github.com/prometheus/common/pull/202
Signed-off-by: beorn7 <beorn@grafana.com>
2019-07-30 23:07:13 +02:00
bb9b00a86e
Merge pull request #624 from prometheus/beorn/push
...
Support new base64 encoding for pushing to the Pushgateway
2019-07-22 21:57:04 +02:00
4b95c4ab42
Support new base64 encoding for pushing to the Pushgateway
...
This should only be released after PGW 0.9 is released.
Signed-off-by: beorn7 <beorn@grafana.com>
2019-07-22 20:31:37 +02:00
c0d684b8af
Merge pull request #623 from prometheus/makefile_common
...
Synchronize Makefile.common from prometheus/prometheus
2019-07-22 15:54:13 +02:00
5322984bff
Merge branch 'beorn7/ci' into makefile_common
2019-07-22 15:47:39 +02:00
6bcb2c8adf
Make lint only run on 1.11 and higher
...
Signed-off-by: beorn7 <beorn@grafana.com>
2019-07-22 15:45:59 +02:00
5b37794e6b
makefile: update Makefile.common with newer version
...
Signed-off-by: prombot <prometheus-team@googlegroups.com>
2019-07-20 00:01:36 +00:00
ff1d4e21c1
Merge pull request #619 from jacksontj/time_formatting
...
Handle formatting when the time in nanoseconds requires more than a single int64
2019-07-09 22:55:12 +02:00
cd27091e79
Handle formatting when the time in nanoseconds requires more than a single int64
...
Signed-off-by: Thomas Jackson <jacksontj.89@gmail.com>
Fixup for #617
2019-07-09 09:23:52 -07:00
b4cb89acd2
Merge pull request #617 from jacksontj/time_formatting
...
Change all time formatting to UTC and off of time.RFC3339Nano
2019-07-09 17:52:25 +02:00
9b5568b9ab
Pass all precision instead of artificially limiting
...
Signed-off-by: Thomas Jackson <jacksontj.89@gmail.com>
2019-07-09 07:31:37 -07:00
c52580de2b
Change all time formatting to UTC and off of time.RFC3339Nano
...
Prometheus has issues parsing RFC3339Nano timestamps if the year has more than 4 digits, in addition it is the second-pass parse attempt. Since this is a client library and the interface is a `time.Time` it makes sense that we pick the clearest simplest format-- so I propose we use the `model.Time` representation of time in our communications to prometheus. This (1) removes the issues with timezones in those queries going downstream and (2) completely works around this #614 issue as the parsing mechanism in prometheus can handle those times in this format.
Related to #614
Signed-off-by: Thomas Jackson <jacksontj.89@gmail.com>
2019-07-09 07:31:37 -07:00
a6c69798cc
Merge pull request #613 from prometheus/beorn7/push
...
Add Delete method to Pusher
2019-06-28 18:29:03 +02:00
48cd700822
Use method constants from the http package
...
Signed-off-by: beorn7 <beorn@grafana.com>
2019-06-28 15:23:00 +02:00
9a1440d469
Add Delete method
...
Fixes #611 .
Signed-off-by: beorn7 <beorn@grafana.com>
2019-06-28 15:12:09 +02:00
f1c4042316
Merge pull request #612 from prometheus/makefile_common
...
Synchronize Makefile.common from prometheus/prometheus
2019-06-26 11:56:01 +02:00
4ea8112816
makefile: update Makefile.common with newer version
...
Signed-off-by: prombot <prometheus-team@googlegroups.com>
2019-06-26 00:01:19 +00:00
7c68e7286a
Merge pull request #610 from prometheus/makefile_common
...
Synchronize Makefile.common from prometheus/prometheus
2019-06-23 13:56:59 +02:00
54b5b0a177
makefile: update Makefile.common with newer version
...
Signed-off-by: prombot <prometheus-team@googlegroups.com>
2019-06-23 00:00:52 +00:00
3d8379da8f
Add Warnings to LabelValues and LabelNames ( #609 )
...
Signed-off-by: Thomas Jackson <jacksontj.89@gmail.com>
2019-06-17 21:27:57 +03:00
beorn7