Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Keep scrape config in line with the new Prometheus scrape config #2091

Merged
merged 2 commits into from
May 27, 2020
Merged

Keep scrape config in line with the new Prometheus scrape config #2091

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1b1de59
Keep scrape config in line with the new Prometheus scrape config
beorn7 May 18, 2020
550e806
Adjust Loki dashboards to the new label order
beorn7 May 22, 2020
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
20 changes: 10 additions & 10 deletions production/helm/promtail/templates/configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,11 @@ data:
- action: replace
source_labels:
- __meta_kubernetes_pod_name
target_label: instance
target_label: pod
- action: replace
source_labels:
- __meta_kubernetes_pod_container_name
target_label: container_name
target_label: container
- replacement: /var/log/pods/*$1/*.log
separator: /
source_labels:
Expand Down Expand Up @@ -94,11 +94,11 @@ data:
- action: replace
source_labels:
- __meta_kubernetes_pod_name
target_label: instance
target_label: pod
- action: replace
source_labels:
- __meta_kubernetes_pod_container_name
target_label: container_name
target_label: container
- replacement: /var/log/pods/*$1/*.log
separator: /
source_labels:
Expand Down Expand Up @@ -147,11 +147,11 @@ data:
- action: replace
source_labels:
- __meta_kubernetes_pod_name
target_label: instance
target_label: pod
- action: replace
source_labels:
- __meta_kubernetes_pod_container_name
target_label: container_name
target_label: container
- replacement: /var/log/pods/*$1/*.log
separator: /
source_labels:
Expand Down Expand Up @@ -202,11 +202,11 @@ data:
- action: replace
source_labels:
- __meta_kubernetes_pod_name
target_label: instance
target_label: pod
- action: replace
source_labels:
- __meta_kubernetes_pod_container_name
target_label: container_name
target_label: container
- replacement: /var/log/pods/*$1/*.log
separator: /
source_labels:
Expand Down Expand Up @@ -250,11 +250,11 @@ data:
- action: replace
source_labels:
- __meta_kubernetes_pod_name
target_label: instance
target_label: pod
- action: replace
source_labels:
- __meta_kubernetes_pod_container_name
target_label: container_name
target_label: container
- replacement: /var/log/pods/*$1/*.log
separator: /
source_labels:
Expand Down
18 changes: 8 additions & 10 deletions production/ksonnet/promtail/scrape_config.libsonnet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ config {
regex: '__meta_kubernetes_pod_label_(.+)',
},

// Rename jobs to be <namespace>/<name, from pod name label>
// Rename jobs to be <namespace>/<service>.
{
source_labels: ['__meta_kubernetes_namespace', '__service__'],
action: 'replace',
Expand All @@ -40,25 +40,24 @@ config {
replacement: '$1',
},

// But also include the namespace as a separate label, for routing alerts
// But also include the namespace, pod, container as separate
// labels. They uniquely identify a container. They are also
// identical to the target labels configured in Prometheus
// (but note that Loki does not use an instance label).
{
source_labels: ['__meta_kubernetes_namespace'],
action: 'replace',
target_label: 'namespace',
},

// Rename instances to be the pod name
{
source_labels: ['__meta_kubernetes_pod_name'],
action: 'replace',
target_label: 'instance',
target_label: 'pod', // Not 'pod_name', which disappeared in K8s 1.16.
},

// Include container_name label
{
source_labels: ['__meta_kubernetes_pod_container_name'],
action: 'replace',
target_label: 'container_name',
target_label: 'container', // Not 'container_name', which disappeared in K8s 1.16.
},

// Kubernetes puts logs under subdirectories keyed pod UID and container_name.
Expand All @@ -76,7 +75,6 @@ config {
// Scrape config to scrape any pods with a 'name' label.
gen_scrape_config('kubernetes-pods-name', '__meta_kubernetes_pod_uid') {
prelabel_config:: [

// Use name label as __service__.
{
source_labels: ['__meta_kubernetes_pod_label_name'],
Expand All @@ -85,7 +83,7 @@ config {
],
},

// Scrape config to scrape any pods with a 'app' label.
// Scrape config to scrape any pods with an 'app' label.
gen_scrape_config('kubernetes-pods-app', '__meta_kubernetes_pod_uid') {
prelabel_config:: [
// Drop pods with a 'name' label. They will have already been added by
Expand Down
18 changes: 9 additions & 9 deletions production/loki-mixin/dashboard-loki-logs.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
"steppedLine": false,
"targets": [
{
"expr": "sum(go_goroutines{cluster=\"$cluster\", namespace=\"$namespace\", instance=~\"$deployment.*\", instance=~\"$pod.*\"})",
"expr": "sum(go_goroutines{cluster=\"$cluster\", namespace=\"$namespace\", pod=~\"$deployment.*\", pod=~\"$pod\"})",
"refId": "A"
}
],
Expand Down Expand Up @@ -146,7 +146,7 @@
"steppedLine": false,
"targets": [
{
"expr": "sum(go_gc_duration_seconds{cluster=\"$cluster\", namespace=\"$namespace\", instance=~\"$deployment.*\", instance=~\"$pod.*\"}) by (quantile)",
"expr": "sum(go_gc_duration_seconds{cluster=\"$cluster\", namespace=\"$namespace\", pod=~\"$deployment.*\", pod=~\"$pod\"}) by (quantile)",
"legendFormat": "{{quantile}}",
"refId": "A"
}
Expand Down Expand Up @@ -233,7 +233,7 @@
"steppedLine": false,
"targets": [
{
"expr": "sum(rate(container_cpu_usage_seconds_total{cluster=\"$cluster\", namespace=\"$namespace\", pod_name=~\"$deployment.*\", pod_name=~\"$pod\", container_name=~\"$container\"}[5m]))",
"expr": "sum(rate(container_cpu_usage_seconds_total{cluster=\"$cluster\", namespace=\"$namespace\", pod=~\"$deployment.*\", pod=~\"$pod\", container=~\"$container\"}[5m]))",
"refId": "A"
}
],
Expand Down Expand Up @@ -319,7 +319,7 @@
"steppedLine": false,
"targets": [
{
"expr": "sum(container_memory_working_set_bytes{cluster=\"$cluster\", namespace=\"$namespace\", pod_name=~\"$deployment.*\", pod_name=~\"$pod\", container_name=~\"$container\"})",
"expr": "sum(container_memory_working_set_bytes{cluster=\"$cluster\", namespace=\"$namespace\", pod=~\"$deployment.*\", pod=~\"$pod\", container=~\"$container\"})",
"refId": "A"
}
],
Expand Down Expand Up @@ -405,7 +405,7 @@
"steppedLine": false,
"targets": [
{
"expr": "sum(rate(container_network_transmit_bytes_total{cluster=\"$cluster\", namespace=\"$namespace\", pod_name=~\"$deployment.*\", pod_name=~\"$pod\"}[5m]))",
"expr": "sum(rate(container_network_transmit_bytes_total{cluster=\"$cluster\", namespace=\"$namespace\", pod=~\"$deployment.*\", pod=~\"$pod\"}[5m]))",
"refId": "A"
}
],
Expand Down Expand Up @@ -491,7 +491,7 @@
"steppedLine": false,
"targets": [
{
"expr": "sum(rate(container_network_receive_bytes_total{cluster=\"$cluster\", namespace=\"$namespace\", pod_name=~\"$deployment.*\", pod_name=~\"$pod\"}[5m]))",
"expr": "sum(rate(container_network_receive_bytes_total{cluster=\"$cluster\", namespace=\"$namespace\", pod=~\"$deployment.*\", pod=~\"$pod\"}[5m]))",
"refId": "A"
}
],
Expand Down Expand Up @@ -664,7 +664,7 @@
"steppedLine": false,
"targets": [
{
"expr": "sum(rate(promtail_custom_bad_words_total{cluster=\"$cluster\", exported_namespace=\"$namespace\", exported_instance=~\"$deployment.*\", exported_instance=~\"$pod.*\", container_name=~\"$container\"}[5m])) by (level)",
"expr": "sum(rate(promtail_custom_bad_words_total{cluster=\"$cluster\", exported_namespace=\"$namespace\", exported_pod=~\"$deployment.*\", exported_pod=~\"$pod\", container=~\"$container\"}[5m])) by (level)",
"legendFormat": "{{level}}",
"refId": "A"
}
Expand Down Expand Up @@ -768,7 +768,7 @@
"steppedLine": false,
"targets": [
{
"expr": "sum(rate({cluster=\"$cluster\", namespace=\"$namespace\", instance=~\"$deployment.*\", instance=~\"$pod.*\", container_name=~\"$container\", level=~\"$level\"}$filter[5m])) by (level)",
"expr": "sum(rate({cluster=\"$cluster\", namespace=\"$namespace\", pod=~\"$deployment.*\", pod=~\"$pod\", container=~\"$container\", level=~\"$level\"}$filter[5m])) by (level)",
"intervalFactor": 3,
"legendFormat": "{{level}}",
"refId": "A"
Expand Down Expand Up @@ -833,7 +833,7 @@
},
"targets": [
{
"expr": "{cluster=\"$cluster\", namespace=\"$namespace\", instance=~\"$deployment.*\", instance=~\"$pod.*\", container_name=~\"$container\", level=~\"$level\"} $filter",
"expr": "{cluster=\"$cluster\", namespace=\"$namespace\", pod=~\"$deployment.*\", pod=~\"$pod\", container=~\"$container\", level=~\"$level\"} $filter",
"refId": "A"
}
],
Expand Down
22 changes: 11 additions & 11 deletions production/loki-mixin/dashboard-loki-operational.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
{
"datasource": "$logs",
"enable": true,
"expr": "{cluster=\"$cluster\", diff_namespace=\"$namespace\", container_name=\"kube-diff-logger\"}",
"expr": "{cluster=\"$cluster\", diff_namespace=\"$namespace\", container=\"kube-diff-logger\"}",
"hide": true,
"iconColor": "rgba(255, 96, 96, 1)",
"name": "deployments",
Expand Down Expand Up @@ -2023,10 +2023,10 @@
"steppedLine": false,
"targets": [
{
"expr": "container_memory_usage_bytes{cluster=\"$cluster\", namespace=\"$namespace\", pod_name=~\"distributor.*\"}",
"expr": "container_memory_usage_bytes{cluster=\"$cluster\", namespace=\"$namespace\", pod=~\"distributor.*\"}",
"instant": false,
"intervalFactor": 3,
"legendFormat": "{{pod_name}}",
"legendFormat": "{{pod}}",
"refId": "A"
}
],
Expand Down Expand Up @@ -2406,9 +2406,9 @@
"steppedLine": false,
"targets": [
{
"expr": "sum(rate(loki_distributor_bytes_received_total{cluster=\"$cluster\", namespace=\"$namespace\"}[5m])) by (instance)",
"expr": "sum(rate(loki_distributor_bytes_received_total{cluster=\"$cluster\", namespace=\"$namespace\"}[5m])) by (pod)",
"intervalFactor": 1,
"legendFormat": "{{instance}}",
"legendFormat": "{{pod}}",
"refId": "A"
}
],
Expand Down Expand Up @@ -2494,9 +2494,9 @@
"steppedLine": false,
"targets": [
{
"expr": "sum(rate(loki_distributor_lines_received_total{cluster=\"$cluster\", namespace=\"$namespace\"}[5m])) by (instance)",
"expr": "sum(rate(loki_distributor_lines_received_total{cluster=\"$cluster\", namespace=\"$namespace\"}[5m])) by (pod)",
"intervalFactor": 1,
"legendFormat": "{{instance}}",
"legendFormat": "{{pod}}",
"refId": "A"
}
],
Expand Down Expand Up @@ -2687,10 +2687,10 @@
"steppedLine": false,
"targets": [
{
"expr": "container_memory_usage_bytes{cluster=\"$cluster\", namespace=\"$namespace\", pod_name=~\"ingester.*\"}",
"expr": "container_memory_usage_bytes{cluster=\"$cluster\", namespace=\"$namespace\", pod=~\"ingester.*\"}",
"instant": false,
"intervalFactor": 3,
"legendFormat": "{{pod_name}}",
"legendFormat": "{{pod}}",
"refId": "A"
}
],
Expand Down Expand Up @@ -3633,10 +3633,10 @@
"steppedLine": false,
"targets": [
{
"expr": "container_memory_usage_bytes{cluster=\"$cluster\", namespace=\"$namespace\", pod_name=~\"querier.*\"}",
"expr": "container_memory_usage_bytes{cluster=\"$cluster\", namespace=\"$namespace\", pod=~\"querier.*\"}",
"instant": false,
"intervalFactor": 3,
"legendFormat": "{{pod_name}}",
"legendFormat": "{{pod}}",
"refId": "A"
}
],
Expand Down
2 changes: 1 addition & 1 deletion production/loki-mixin/dashboards.libsonnet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ local utils = import 'mixin-utils/utils.libsonnet';
g.row('Flush Stats')
.addPanel(
g.panel('Queue Length') +
g.queryPanel('cortex_ingester_flush_queue_length{cluster="$cluster", job="$namespace/ingester"}', '{{instance}}'),
g.queryPanel('cortex_ingester_flush_queue_length{cluster="$cluster", job="$namespace/ingester"}', '{{pod}}'),
)
.addPanel(
g.panel('Flush Rate') +
Expand Down