mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2025-03-05 20:59:13 -08:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity
12497 commits 313 branches 456 tags 672 MiB
Commit graph

661 commits

Author SHA1 Message Date
Arve Knudsen f047647bb0 Merge remote-tracking branch 'prometheus/main' into arve/sync-upstream 
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
 2023-11-24 14:36:13 +01:00
Charles Korn 2329fba0e5
Fix linting issues in comments (#13178) 
Signed-off-by: Charles Korn <charles.korn@grafana.com>
 2023-11-23 09:07:23 +00:00
Etourneau Gwenn b37258c99b
Added Caching of network interface for Azure (#12622) 
* Added Caching of network interface for Azure

Signed-off-by: Etourneau Gwenn <getourneau@yugabyte.com>

* Rename Counter for Azure cache

Signed-off-by: Etourneau Gwenn <getourneau@yugabyte.com>

* Format with goimports

Signed-off-by: Etourneau Gwenn <getourneau@yugabyte.com>

* Updated duration comparaison
Enabled cache by default with 5x the default refresh time

Signed-off-by: Etourneau Gwenn <getourneau@yugabyte.com>

* Change random function

Signed-off-by: Etourneau Gwenn <getourneau@yugabyte.com>

* Remove refresh interval

Signed-off-by: Etourneau Gwenn <getourneau@yugabyte.com>

* Remove from config as well

Signed-off-by: Etourneau Gwenn <getourneau@yugabyte.com>

* Reformat config_test
Removed uneeded error

Signed-off-by: Etourneau Gwenn <getourneau@yugabyte.com>

---------

Signed-off-by: Etourneau Gwenn <getourneau@yugabyte.com>
 2023-11-21 11:59:17 +00:00
Bryan Boreham 6613195487
Merge pull request #13097 from roidelapluie/gpu 
Linode SD: Add __meta_linode_gpus label
 2023-11-13 14:22:37 +00:00
Julien Pivotto 222d46d243 Linode: Add GPU label 
Signed-off-by: Julien Pivotto <roidelapluie@o11y.eu>
 2023-11-03 15:34:31 -04:00
Matthieu MOREL fe057fc60d use Go standard errors package 
Signed-off-by: Matthieu MOREL <matthieu.morel35@gmail.com>
 2023-11-03 07:26:31 +00:00
György Krajcsovits d42e296516 Merge remote-tracking branch 'upstream/main' into krajo/merge-upstream 2023-11-02 20:45:05 +01:00
Dimitar Dimitrov dba5006d7a
Merge branch 'upstream/main' into dimitar/sync-with-upstream-main 2023-11-01 14:06:11 +01:00
Oleksandr Redko fa90ca46e5 ci(lint): enable godot; append dot at the end of comments 
Signed-off-by: Oleksandr Redko <Oleksandr_Redko@epam.com>
 2023-10-31 19:53:38 +02:00
Matthieu MOREL 68e6b4dd34
ci(lint): enable errorlint on discovery (#12918) 
Signed-off-by: Matthieu MOREL <matthieu.morel35@gmail.com>
 2023-10-31 12:46:55 +01:00
Oleksandr Redko 8e5f0387a2
ci(lint): enable nolintlint and remove redundant comments (#12926) 
Signed-off-by: Oleksandr Redko <Oleksandr_Redko@epam.com>
 2023-10-31 12:35:13 +01:00
Jeanette Tan f898005c69 Merge remote-tracking branch 'upstream/main' into sync-upstream-20231018 2023-10-18 11:43:51 +08:00
Matthieu MOREL bbdc7d5902 Update Azure SDK For Go 
Signed-off-by: Matthieu MOREL <matthieu.morel35@gmail.com>
 2023-10-14 03:39:31 +00:00
Arve Knudsen 35ab75918a Merge remote-tracking branch 'prometheus/main' into arve/upgrade-exp 
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
 2023-10-06 16:11:40 +02:00
Julien Pivotto 4b735f02a6
Merge pull request #10569 from zzJinux/discovery-manager-run 
Fix discovery managers to be properly cancelled
 2023-09-29 12:07:55 +02:00
Arve Knudsen e48d4e5835 Merge remote-tracking branch 'prometheus/main' into chore/sync-prometheus 
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
 2023-09-18 09:29:42 +02:00
Julien Pivotto d659e672f1
Merge pull request #12816 from slashpai/lightsail 
LIGHTSAIL SD: Validate HTTP config
 2023-09-08 15:01:35 +02:00
Julien Pivotto 738e0dbaf0
Merge pull request #12814 from slashpai/puppetdb 
PUPPETDB SD: Validate HTTP config
 2023-09-08 15:00:21 +02:00
Julien Pivotto a2208b2849
Merge pull request #12815 from slashpai/Uyuni 
UYUNI SD: Validate HTTP config
 2023-09-08 14:59:50 +02:00
Jayapriya Pai 57988fda75
LIGHTSAIL SD: Validate HTTP config 
Related-to #12810

Signed-off-by: Jayapriya Pai <janantha@redhat.com>
 2023-09-08 17:54:58 +05:30
Jayapriya Pai 344f9d8d15
PUPPETDB SD: Validate HTTP config 
Related-to #12810

Signed-off-by: Jayapriya Pai <janantha@redhat.com>
 2023-09-08 17:42:01 +05:30
Jayapriya Pai 34c8dcc73f
UYUNI SD: Validate HTTP config 
Related-to #12810

Signed-off-by: Jayapriya Pai <janantha@redhat.com>
 2023-09-08 17:34:41 +05:30
Julien Pivotto 75470ba815
Merge pull request #12812 from slashpai/azure 
AZURE SD: Validate HTTP config
 2023-09-08 14:03:19 +02:00
Jayapriya Pai e44d5dfb3a
AZURE SD: Validate HTTP config 
Related-to #12810

Signed-off-by: Jayapriya Pai <janantha@redhat.com>
 2023-09-08 13:10:31 +05:30
Jayapriya Pai 7f085aeb6a
EC2 SD: Validate HTTP config 
Related-to #12810

Signed-off-by: Jayapriya Pai <janantha@redhat.com>
 2023-09-08 11:46:07 +05:30
Dimitar Dimitrov 77ac7ad40a
Merge remote-tracking branch 'upstream/main' into dimitar/pull-upstream 2023-09-05 16:19:00 +02:00
Julien Pivotto 8498b96a2b HTTP SD: Validate HTTP config 
Fixes #12762

Signed-off-by: Julien Pivotto <roidelapluie@o11y.eu>
 2023-09-03 23:06:30 +02:00
Julien Pivotto 009017a3fb Revert "Remove deleted target from discovery manager" 
Signed-off-by: Julien Pivotto <roidelapluie@o11y.eu>
 2023-08-14 23:29:39 +02:00
Julien Pivotto 103b8567d6
Merge pull request #12541 from haleyao/main 
Remove deleted target from discovery manager
 2023-08-14 15:37:59 +02:00
Julien Pivotto ea039fcebf
Merge pull request #11463 from proggga/small_refactor 
marathon.go: Simplified conditions in method
 2023-08-14 15:09:02 +02:00
Marc Tuduri 98383fdc63
sd: change hetzner role type and constants to be exportable 
Signed-off-by: Marc Tuduri <marctc@protonmail.com>
 2023-07-31 12:59:50 +02:00
Jeanette Tan 8035c04624 Merge remote-tracking branch 'upstream/main' 
Minor conflicts:
rules/manager.go
tsdb/compact.go
tsdb/db.go
go.mod
 2023-07-19 21:40:27 +08:00
Julien Pivotto 2bdb2e627f
Merge pull request #10914 from wangrzneu/add-endpointslice-label 
Add more labels for endpointslice and endpoints role in k8s discovery
 2023-07-18 13:35:03 +02:00
Julian Tölle 7aa7965716
build(deps): bump github.com/hetznercloud/hcloud-go to v2.0.0 
Version 2 introduced a breaking change in the `id` field of all
resources. They were changed from `int` to `int64` to make sure that all
future numerical IDs are supported on all architectures.

You can learn more about this
[here](https://docs.hetzner.cloud/#deprecation-notices-%E2%9A%A0%EF%B8%8F)

Signed-off-by: Julian Tölle <julian.toelle@hetzner-cloud.de>
 2023-07-17 14:25:29 +02:00
Daniel Swarbrick de89a8c827
Linode SD: cast InstanceSpec values to int64 to avoid overflows 
InstanceSpec struct members are untyped integers, so they can overflow
on 32-bit arch when bit-shifted left.

Signed-off-by: Daniel Swarbrick <daniel.swarbrick@gmail.com>
 2023-07-16 19:23:44 +02:00
Mikhail Fesenko 02e11cc2a7
Fix from discussion 
Signed-off-by: Mikhail Fesenko <proggga@gmail.com>
 2023-07-13 00:53:19 +02:00
Mikhail Fesenko 17cdfdd79f
maraphon.go: Simplified conditions in method 
Signed-off-by: Mikhail Fesenko <proggga@gmail.com>
 2023-07-13 00:44:13 +02:00
haleyao c5a37ddad5 Remove deleted target from discovery manager 
Signed-off-by: haleyao <haleyao@tencent.com>
 2023-07-10 00:09:25 +08:00
Marco Pracucci 7ad111b27e
Merge remote-tracking branch 'remotes/prometheus/main' into update-upstream 2023-07-06 15:13:54 +02:00
Julien Pivotto 076056ccdf
Merge pull request #11642 from zoonage/main 
Do not add pods to target group if the PodIP status is not set
 2023-07-05 23:10:50 +02:00
Taavi Väänänen 0f4c27e2bf
discovery/openstack: Include instance image ID in labels 
Adds a new label to include the ID of the image that an instance is
using. This can be used for example to filter a job to only include
instances using a certain image as that image includes some exporter.

Sometimes the image information isn't available, such as when the image
is private and the user doesn't have the roles required to see it. In
those cases we just don't set the label, as the rest of the information
from the discovery provider can still be used.

Signed-off-by: Taavi Väänänen <hi@taavi.wtf>
 2023-07-04 18:50:11 +03:00
Matt Harbison 407b6be630 Fix path handling in File-SD watcher to allow directory monitoring on Windows 
Previously, `d.paths` were normalized to backslashes on Windows, even when if
the config file used Unix style.  The end result meant always watching `./`, so
changes for this config were always ignored:

    scrape_configs:
      - job_name: 'envmsc1'
        file_sd_configs:
        - files:
          - 'targets/envmsc1.d/*.yml'
          - 'targets/envmsc1.d/*.yaml'

Additionally, unlike the other platforms, no warning was emitted on startup
about not being able to install the watch if the directory didn't exist.  Now it
is logged.

Signed-off-by: Matt Harbison <mharbison@atto.com>
 2023-07-04 15:01:01 +00:00
Matt Harbison 02277bbe0d Fix path handling in File-SD watcher to allow directory monitoring on Windows 
Previously, `d.paths` were normalized to backslashes on Windows, even when if
the config file used Unix style.  The end result meant always watching `./`, so
changes for this config were always ignored:

    scrape_configs:
      - job_name: 'envmsc1'
        file_sd_configs:
        - files:
          - 'targets/envmsc1.d/*.yml'
          - 'targets/envmsc1.d/*.yaml'

Additionally, unlike the other platforms, no warning was emitted on startup
about not being able to install the watch if the directory didn't exist.  Now it
is logged.

Signed-off-by: Matt Harbison <mharbison@atto.com>
 2023-06-23 16:37:04 -04:00
renzheng.wang b2c5de2e65 fix lint issue 
Signed-off-by: renzheng.wang <wangrzneu@gmail.com>
 2023-05-30 20:35:04 +08:00
renzheng.wang 98ffad01b8 update tests and docs 
Signed-off-by: renzheng.wang <wangrzneu@gmail.com>
 2023-05-30 20:13:52 +08:00
renzheng.wang 866fa25b20 add label and labelpresent for endpointslice role in k8s discovery 
Signed-off-by: renzheng.wang <wangrzneu@gmail.com>
 2023-05-30 20:13:38 +08:00
Jeanette Tan 1be0816b46 Merge remote-tracking branch 'upstream/main' 2023-05-23 00:20:36 +08:00
Julien Pivotto 0dc31ade41 Add support for consul path_prefix 
Signed-off-by: Julien Pivotto <roidelapluie@o11y.eu>
 2023-05-17 00:14:58 +02:00
Mickael Carl 2f35619710 discovery/kubernetes: attach node labels when the endpoints TargetRef's kind are Node 
Signed-off-by: Mickael Carl <mcarl@apple.com>
 2023-05-11 10:11:56 +01:00
György Krajcsovits 65b8edbed4 Merge remote-tracking branch 'upstream/main' into sync-upstream-28-apr-2023 2023-04-28 18:04:02 +02:00