discovery/kubernetes: fix support for password_file and bearer_token_file

[simonpasquier]

Closes #5210
Closes #5221

[gouthamve]

Shouldn't this target the release-2.7 branch? I'll release a 2.7.2 with this fix.

[simonpasquier]

@gouthamve this isn't a regression from the previous minor release so I'd say that it can wait for v2.8.0 but it is up to you if you want to get it fixed in release-2.7.

[brian-brazil]

👍

[tkornai]

Hi @gouthamve, do you still plan to release a new minor version with this fix by any chance? Or can we expect a 2.8 release any time soon? Thanks!

[simonpasquier]

@tkornai the first RC of 2.8 is slated for the end of the month, see https://github.com/prometheus/prometheus/blob/master/RELEASE.md#release-schedule

[adamdecaf]

Is api_server required now? Prometheus's kubernetes discovery works fine without specifying this, but promtool complains that api_server isn't set.

Edit: I'm on promtool from master (commit 5fbda4c)

The current docs mention it can be left off: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#kubernetes_sd_config

FAILED: parsing YAML file infra/14-prometheus.yml: to use custom HTTP client configuration please provide the 'api_server' URL explicitly

    global:
      scrape_interval: 15s
      scrape_timeout: 10s
      evaluation_interval: 15s
    rule_files:
      - /opt/prometheus-rules/*.yml
    scrape_configs:
      - job_name: 'kubernetes-pods'
        kubernetes_sd_configs:
          - role: pod
        relabel_configs:
          - action: labelmap
            regex: __meta_kubernetes_pod_label_(.+)
          - source_labels: [__meta_kubernetes_namespace]
            action: replace
            target_label: kubernetes_namespace
          - source_labels: [__meta_kubernetes_pod_name]
            action: replace
            target_label: kubernetes_pod_name
          - action: labeldrop
            regex: '(pod_template_hash)'

[simonpasquier]

Is api_server required now?

No this shouldn't change with this PR. I'll have a look...

[simonpasquier]

#5256 should fix it. Thanks for reporting @adamdecaf!