Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions charts/linkerd-control-plane/templates/podmonitor.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@ spec:
podMetricsEndpoints:
- interval: {{ $podMonitor.scrapeInterval }}
scrapeTimeout: {{ $podMonitor.scrapeTimeout }}
{{- if not (kindIs "invalid" $podMonitor.controller.honorTimestamps) }}
honorTimestamps: {{ $podMonitor.controller.honorTimestamps }}
{{- end }}
relabelings:
- sourceLabels:
- __meta_kubernetes_pod_container_port_name
Expand Down Expand Up @@ -60,6 +63,9 @@ spec:
podMetricsEndpoints:
- interval: {{ $podMonitor.scrapeInterval }}
scrapeTimeout: {{ $podMonitor.scrapeTimeout }}
{{- if not (kindIs "invalid" $podMonitor.serviceMirror.honorTimestamps) }}
honorTimestamps: {{ $podMonitor.serviceMirror.honorTimestamps }}
{{- end }}
relabelings:
- sourceLabels:
- __meta_kubernetes_pod_label_linkerd_io_control_plane_component
Expand Down Expand Up @@ -99,6 +105,9 @@ spec:
podMetricsEndpoints:
- interval: {{ $podMonitor.scrapeInterval }}
scrapeTimeout: {{ $podMonitor.scrapeTimeout }}
{{- if not (kindIs "invalid" $podMonitor.proxy.honorTimestamps) }}
honorTimestamps: {{ $podMonitor.proxy.honorTimestamps }}
{{- end }}
relabelings:
- sourceLabels:
- __meta_kubernetes_pod_container_name
Expand Down
10 changes: 10 additions & 0 deletions charts/linkerd-control-plane/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -722,12 +722,22 @@ podMonitor:
matchNames:
- {{ .Release.Namespace }}
- linkerd-viz
# -- Sets honorTimestamps for the control-plane PodMonitor endpoint. When set to false
# Prometheus uses scrape time instead of exporter-provided timestamps.
honorTimestamps: false
serviceMirror:
# -- Enables the creation of PodMonitor for the Service Mirror component
enabled: true
# -- Sets honorTimestamps for the Service Mirror PodMonitor endpoint. When set to false,
# Prometheus uses scrape time instead of exporter-provided timestamps.
honorTimestamps: false
proxy:
# -- Enables the creation of PodMonitor for the data-plane
enabled: true
# -- Sets honorTimestamps for the proxy PodMonitor endpoint. When set to false,
# Prometheus uses scrape time instead of exporter-provided timestamps,
# preventing duplicate timestamp drops in clusters with frequent pod restarts.
honorTimestamps: false


# Egress related configuration
Expand Down
3 changes: 3 additions & 0 deletions cli/cmd/testdata/install_controlplane_tracing_output.golden

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions cli/cmd/testdata/install_custom_domain.golden

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions cli/cmd/testdata/install_custom_registry.golden

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions cli/cmd/testdata/install_default.golden

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions cli/cmd/testdata/install_default_token.golden

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions cli/cmd/testdata/install_gid_output.golden

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions cli/cmd/testdata/install_ha_output.golden

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions cli/cmd/testdata/install_ha_with_overrides_output.golden

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions cli/cmd/testdata/install_heartbeat_disabled_output.golden

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions cli/cmd/testdata/install_helm_control_plane_output.golden

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions cli/cmd/testdata/install_helm_output_ha_labels.golden

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions cli/cmd/testdata/install_no_init_container.golden

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading