-
Notifications
You must be signed in to change notification settings - Fork 13
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.
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
feat(deps): update helm release promtail to 6.16.6 #2177
base: main
Are you sure you want to change the base?
Conversation
Path: @@ -129,7 +129,7 @@
app.kubernetes.io/name: promtail
app.kubernetes.io/instance: promtail
annotations:
- checksum/config: 0851d5695bfb82ba17dc02f957fcc38a47e303b7b922e4a220d679b3a611573d
+ checksum/config: 03cadbd0ef8a620a866edbb7d8d47e847f22c105e171457510ef9c3b7f186676
spec:
serviceAccountName: promtail
securityContext:
@@ -213,7 +213,6 @@
kind: ServiceMonitor
metadata:
name: promtail
- namespace: default
labels:
app.kubernetes.io/name: promtail
app.kubernetes.io/instance: promtail
@@ -225,3 +224,4 @@
app.kubernetes.io/instance: promtail
endpoints:
- port: http-metrics
+ scheme: http |
3ef051d
to
115c968
Compare
Path: @@ -129,7 +129,7 @@
app.kubernetes.io/name: promtail
app.kubernetes.io/instance: promtail
annotations:
- checksum/config: 0851d5695bfb82ba17dc02f957fcc38a47e303b7b922e4a220d679b3a611573d
+ checksum/config: 7dc30c0233bf5bccda60703e52a127a0e88b683b6f273762ca3b3a2028c4d9c2
spec:
serviceAccountName: promtail
securityContext:
@@ -176,7 +176,7 @@
readinessProbe:
failureThreshold: 5
httpGet:
- path: /ready
+ path: '/ready'
port: http-metrics
initialDelaySeconds: 10
periodSeconds: 10
@@ -213,7 +213,6 @@
kind: ServiceMonitor
metadata:
name: promtail
- namespace: default
labels:
app.kubernetes.io/name: promtail
app.kubernetes.io/instance: promtail
@@ -225,3 +224,4 @@
app.kubernetes.io/instance: promtail
endpoints:
- port: http-metrics
+ scheme: http |
115c968
to
35bc9d4
Compare
Path: @@ -129,9 +129,10 @@
app.kubernetes.io/name: promtail
app.kubernetes.io/instance: promtail
annotations:
- checksum/config: 0851d5695bfb82ba17dc02f957fcc38a47e303b7b922e4a220d679b3a611573d
+ checksum/config: f98e10a525f2b8b61370a02b6cb6a453fcff826d733efcfa7641553ce639e1f6
spec:
serviceAccountName: promtail
+ enableServiceLinks: true
securityContext:
runAsGroup: 0
runAsUser: 0
@@ -176,7 +177,7 @@
readinessProbe:
failureThreshold: 5
httpGet:
- path: /ready
+ path: '/ready'
port: http-metrics
initialDelaySeconds: 10
periodSeconds: 10
@@ -213,7 +214,6 @@
kind: ServiceMonitor
metadata:
name: promtail
- namespace: default
labels:
app.kubernetes.io/name: promtail
app.kubernetes.io/instance: promtail
@@ -225,3 +225,4 @@
app.kubernetes.io/instance: promtail
endpoints:
- port: http-metrics
+ scheme: http |
35bc9d4
to
e67c8ae
Compare
Path: @@ -129,9 +129,10 @@
app.kubernetes.io/name: promtail
app.kubernetes.io/instance: promtail
annotations:
- checksum/config: 0851d5695bfb82ba17dc02f957fcc38a47e303b7b922e4a220d679b3a611573d
+ checksum/config: b0255f492737a96f1b84e5e75a19449e21b6b8b0accda03d7b6f3ebe1495e4d8
spec:
serviceAccountName: promtail
+ enableServiceLinks: true
securityContext:
runAsGroup: 0
runAsUser: 0
@@ -176,7 +177,7 @@
readinessProbe:
failureThreshold: 5
httpGet:
- path: /ready
+ path: '/ready'
port: http-metrics
initialDelaySeconds: 10
periodSeconds: 10
@@ -213,7 +214,6 @@
kind: ServiceMonitor
metadata:
name: promtail
- namespace: default
labels:
app.kubernetes.io/name: promtail
app.kubernetes.io/instance: promtail
@@ -225,3 +225,4 @@
app.kubernetes.io/instance: promtail
endpoints:
- port: http-metrics
+ scheme: http |
e67c8ae
to
e506d0a
Compare
Path: @@ -129,15 +129,16 @@
app.kubernetes.io/name: promtail
app.kubernetes.io/instance: promtail
annotations:
- checksum/config: 0851d5695bfb82ba17dc02f957fcc38a47e303b7b922e4a220d679b3a611573d
+ checksum/config: df47ce1f5379431272365df1b6324d6cc1c6df0c60bfd822281c773262aa3a76
spec:
serviceAccountName: promtail
+ enableServiceLinks: true
securityContext:
runAsGroup: 0
runAsUser: 0
containers:
- name: promtail
- image: "ghcr.io/k8s-at-home/promtail:2.6.1"
+ image: "ghcr.io/k8s-at-home/promtail:2.7.0"
imagePullPolicy: IfNotPresent
args:
- "-config.file=/etc/promtail/promtail.yaml"
@@ -176,7 +177,7 @@
readinessProbe:
failureThreshold: 5
httpGet:
- path: /ready
+ path: '/ready'
port: http-metrics
initialDelaySeconds: 10
periodSeconds: 10
@@ -213,7 +214,6 @@
kind: ServiceMonitor
metadata:
name: promtail
- namespace: default
labels:
app.kubernetes.io/name: promtail
app.kubernetes.io/instance: promtail
@@ -225,3 +225,4 @@
app.kubernetes.io/instance: promtail
endpoints:
- port: http-metrics
+ scheme: http |
e506d0a
to
5176ab4
Compare
Path: @@ -129,15 +129,16 @@
app.kubernetes.io/name: promtail
app.kubernetes.io/instance: promtail
annotations:
- checksum/config: 0851d5695bfb82ba17dc02f957fcc38a47e303b7b922e4a220d679b3a611573d
+ checksum/config: e41329480c28295004f73b83d7ba8a6aec291c0076da013816bde49be322109a
spec:
serviceAccountName: promtail
+ enableServiceLinks: true
securityContext:
runAsGroup: 0
runAsUser: 0
containers:
- name: promtail
- image: "ghcr.io/k8s-at-home/promtail:2.6.1"
+ image: "ghcr.io/k8s-at-home/promtail:2.7.0"
imagePullPolicy: IfNotPresent
args:
- "-config.file=/etc/promtail/promtail.yaml"
@@ -176,7 +177,7 @@
readinessProbe:
failureThreshold: 5
httpGet:
- path: /ready
+ path: '/ready'
port: http-metrics
initialDelaySeconds: 10
periodSeconds: 10
@@ -213,7 +214,6 @@
kind: ServiceMonitor
metadata:
name: promtail
- namespace: default
labels:
app.kubernetes.io/name: promtail
app.kubernetes.io/instance: promtail
@@ -225,3 +225,4 @@
app.kubernetes.io/instance: promtail
endpoints:
- port: http-metrics
+ scheme: http |
5176ab4
to
26e91ce
Compare
Path: @@ -129,15 +129,16 @@
app.kubernetes.io/name: promtail
app.kubernetes.io/instance: promtail
annotations:
- checksum/config: 0851d5695bfb82ba17dc02f957fcc38a47e303b7b922e4a220d679b3a611573d
+ checksum/config: 6e70f94a455f9254b0df8888f7e09d24f1973c990723675be5f959e9fcf6e264
spec:
serviceAccountName: promtail
+ enableServiceLinks: true
securityContext:
runAsGroup: 0
runAsUser: 0
containers:
- name: promtail
- image: "ghcr.io/k8s-at-home/promtail:2.6.1"
+ image: "ghcr.io/k8s-at-home/promtail:2.7.0"
imagePullPolicy: IfNotPresent
args:
- "-config.file=/etc/promtail/promtail.yaml"
@@ -176,7 +177,7 @@
readinessProbe:
failureThreshold: 5
httpGet:
- path: /ready
+ path: '/ready'
port: http-metrics
initialDelaySeconds: 10
periodSeconds: 10
@@ -213,7 +214,6 @@
kind: ServiceMonitor
metadata:
name: promtail
- namespace: default
labels:
app.kubernetes.io/name: promtail
app.kubernetes.io/instance: promtail
@@ -225,3 +225,4 @@
app.kubernetes.io/instance: promtail
endpoints:
- port: http-metrics
+ scheme: http |
26e91ce
to
2cc698c
Compare
Path: @@ -129,15 +129,16 @@
app.kubernetes.io/name: promtail
app.kubernetes.io/instance: promtail
annotations:
- checksum/config: 0851d5695bfb82ba17dc02f957fcc38a47e303b7b922e4a220d679b3a611573d
+ checksum/config: 2eb2a70e12cd868e3919273038d9e4af0324b6547e9e5aa28a8798ec4e319df1
spec:
serviceAccountName: promtail
+ enableServiceLinks: true
securityContext:
runAsGroup: 0
runAsUser: 0
containers:
- name: promtail
- image: "ghcr.io/k8s-at-home/promtail:2.6.1"
+ image: "ghcr.io/k8s-at-home/promtail:2.7.0"
imagePullPolicy: IfNotPresent
args:
- "-config.file=/etc/promtail/promtail.yaml"
@@ -176,7 +177,7 @@
readinessProbe:
failureThreshold: 5
httpGet:
- path: /ready
+ path: '/ready'
port: http-metrics
initialDelaySeconds: 10
periodSeconds: 10
@@ -213,7 +214,6 @@
kind: ServiceMonitor
metadata:
name: promtail
- namespace: default
labels:
app.kubernetes.io/name: promtail
app.kubernetes.io/instance: promtail
@@ -225,3 +225,4 @@
app.kubernetes.io/instance: promtail
endpoints:
- port: http-metrics
+ scheme: http |
2cc698c
to
89c3127
Compare
Path: @@ -129,15 +129,16 @@
app.kubernetes.io/name: promtail
app.kubernetes.io/instance: promtail
annotations:
- checksum/config: 0851d5695bfb82ba17dc02f957fcc38a47e303b7b922e4a220d679b3a611573d
+ checksum/config: 1bcd806cbd8226f9a9a51d97d7209b3fac7cf42ab480edc60075c9d04b0d3a0b
spec:
serviceAccountName: promtail
+ enableServiceLinks: true
securityContext:
runAsGroup: 0
runAsUser: 0
containers:
- name: promtail
- image: "ghcr.io/k8s-at-home/promtail:2.6.1"
+ image: "ghcr.io/k8s-at-home/promtail:2.7.0"
imagePullPolicy: IfNotPresent
args:
- "-config.file=/etc/promtail/promtail.yaml"
@@ -176,7 +177,7 @@
readinessProbe:
failureThreshold: 5
httpGet:
- path: /ready
+ path: '/ready'
port: http-metrics
initialDelaySeconds: 10
periodSeconds: 10
@@ -213,7 +214,6 @@
kind: ServiceMonitor
metadata:
name: promtail
- namespace: default
labels:
app.kubernetes.io/name: promtail
app.kubernetes.io/instance: promtail
@@ -225,3 +225,4 @@
app.kubernetes.io/instance: promtail
endpoints:
- port: http-metrics
+ scheme: http |
89c3127
to
8410a6a
Compare
Path: @@ -129,15 +129,16 @@
app.kubernetes.io/name: promtail
app.kubernetes.io/instance: promtail
annotations:
- checksum/config: 0851d5695bfb82ba17dc02f957fcc38a47e303b7b922e4a220d679b3a611573d
+ checksum/config: 5c51f86ac1a4f7ce13688d9cc0c4ec02ebf3ed3e78d64153fd6afea3dea58fe2
spec:
serviceAccountName: promtail
+ enableServiceLinks: true
securityContext:
runAsGroup: 0
runAsUser: 0
containers:
- name: promtail
- image: "ghcr.io/k8s-at-home/promtail:2.6.1"
+ image: "ghcr.io/k8s-at-home/promtail:2.7.0"
imagePullPolicy: IfNotPresent
args:
- "-config.file=/etc/promtail/promtail.yaml"
@@ -176,7 +177,7 @@
readinessProbe:
failureThreshold: 5
httpGet:
- path: /ready
+ path: '/ready'
port: http-metrics
initialDelaySeconds: 10
periodSeconds: 10
@@ -213,7 +214,6 @@
kind: ServiceMonitor
metadata:
name: promtail
- namespace: default
labels:
app.kubernetes.io/name: promtail
app.kubernetes.io/instance: promtail
@@ -225,3 +225,4 @@
app.kubernetes.io/instance: promtail
endpoints:
- port: http-metrics
+ scheme: http |
8a6b0a9
to
c32e435
Compare
Path: @@ -20,7 +20,7 @@
app.kubernetes.io/instance: promtail
app.kubernetes.io/managed-by: Helm
stringData:
- promtail.yaml: "server:\n log_level: info\n http_listen_port: 3101\n \n\nclients:\n - url: http://loki-gateway/loki/api/v1/push\n\npositions:\n filename: /run/promtail/positions.yaml\n\nscrape_configs:\n # See also https://github.com/grafana/loki/blob/master/production/ksonnet/promtail/scrape_config.libsonnet for reference\n - job_name: kubernetes-pods\n pipeline_stages:\n - cri: {}\n kubernetes_sd_configs:\n - role: pod\n relabel_configs:\n - source_labels:\n - __meta_kubernetes_pod_controller_name\n regex: ([0-9a-z-.]+?)(-[0-9a-f]{8,10})?\n action: replace\n target_label: __tmp_controller_name\n - source_labels:\n - __meta_kubernetes_pod_label_app_kubernetes_io_name\n - __meta_kubernetes_pod_label_app\n - __tmp_controller_name\n - __meta_kubernetes_pod_name\n regex: ^;*([^;]+)(;.*)?$\n action: replace\n target_label: app\n - source_labels:\n - __meta_kubernetes_pod_label_app_kubernetes_io_instance\n - __meta_kubernetes_pod_label_release\n regex: ^;*([^;]+)(;.*)?$\n action: replace\n target_label: instance\n - source_labels:\n - __meta_kubernetes_pod_label_app_kubernetes_io_component\n - __meta_kubernetes_pod_label_component\n regex: ^;*([^;]+)(;.*)?$\n action: replace\n target_label: component\n - action: replace\n source_labels:\n - __meta_kubernetes_pod_node_name\n target_label: node_name\n - action: replace\n source_labels:\n - __meta_kubernetes_namespace\n target_label: namespace\n - action: replace\n replacement: $1\n separator: /\n source_labels:\n - namespace\n - app\n target_label: job\n - action: replace\n source_labels:\n - __meta_kubernetes_pod_name\n target_label: pod\n - action: replace\n source_labels:\n - __meta_kubernetes_pod_container_name\n target_label: container\n - action: replace\n replacement: /var/log/pods/*$1/*.log\n separator: /\n source_labels:\n - __meta_kubernetes_pod_uid\n - __meta_kubernetes_pod_container_name\n target_label: __path__\n - action: replace\n regex: true/(.*)\n replacement: /var/log/pods/*$1/*.log\n separator: /\n source_labels:\n - __meta_kubernetes_pod_annotationpresent_kubernetes_io_config_hash\n - __meta_kubernetes_pod_annotation_kubernetes_io_config_hash\n - __meta_kubernetes_pod_container_name\n target_label: __path__\n \n - job_name: syslog\n syslog:\n listen_address: 0.0.0.0:1514\n label_structured_data: true\n labels:\n job: \"syslog\"\n relabel_configs:\n - source_labels: ['__syslog_message_hostname']\n target_label: host\n - job_name: journal\n journal:\n path: /var/log/journal\n max_age: 12h\n labels:\n job: systemd-journal\n relabel_configs:\n - source_labels: ['__journal__systemd_unit']\n target_label: 'unit'\n - source_labels: ['__journal__hostname']\n target_label: 'hostname'\n \n\nlimits_config:\n"
+ promtail.yaml: "server:\n log_level: info\n log_format: logfmt\n http_listen_port: 3101\n \n\nclients:\n - url: http://loki-gateway/loki/api/v1/push\n\npositions:\n filename: /run/promtail/positions.yaml\n\nscrape_configs:\n # See also https://github.com/grafana/loki/blob/master/production/ksonnet/promtail/scrape_config.libsonnet for reference\n - job_name: kubernetes-pods\n pipeline_stages:\n - cri: {}\n kubernetes_sd_configs:\n - role: pod\n relabel_configs:\n - source_labels:\n - __meta_kubernetes_pod_controller_name\n regex: ([0-9a-z-.]+?)(-[0-9a-f]{8,10})?\n action: replace\n target_label: __tmp_controller_name\n - source_labels:\n - __meta_kubernetes_pod_label_app_kubernetes_io_name\n - __meta_kubernetes_pod_label_app\n - __tmp_controller_name\n - __meta_kubernetes_pod_name\n regex: ^;*([^;]+)(;.*)?$\n action: replace\n target_label: app\n - source_labels:\n - __meta_kubernetes_pod_label_app_kubernetes_io_instance\n - __meta_kubernetes_pod_label_instance\n regex: ^;*([^;]+)(;.*)?$\n action: replace\n target_label: instance\n - source_labels:\n - __meta_kubernetes_pod_label_app_kubernetes_io_component\n - __meta_kubernetes_pod_label_component\n regex: ^;*([^;]+)(;.*)?$\n action: replace\n target_label: component\n - action: replace\n source_labels:\n - __meta_kubernetes_pod_node_name\n target_label: node_name\n - action: replace\n source_labels:\n - __meta_kubernetes_namespace\n target_label: namespace\n - action: replace\n replacement: $1\n separator: /\n source_labels:\n - namespace\n - app\n target_label: job\n - action: replace\n source_labels:\n - __meta_kubernetes_pod_name\n target_label: pod\n - action: replace\n source_labels:\n - __meta_kubernetes_pod_container_name\n target_label: container\n - action: replace\n replacement: /var/log/pods/*$1/*.log\n separator: /\n source_labels:\n - __meta_kubernetes_pod_uid\n - __meta_kubernetes_pod_container_name\n target_label: __path__\n - action: replace\n regex: true/(.*)\n replacement: /var/log/pods/*$1/*.log\n separator: /\n source_labels:\n - __meta_kubernetes_pod_annotationpresent_kubernetes_io_config_hash\n - __meta_kubernetes_pod_annotation_kubernetes_io_config_hash\n - __meta_kubernetes_pod_container_name\n target_label: __path__\n \n - job_name: syslog\n syslog:\n listen_address: 0.0.0.0:1514\n label_structured_data: true\n labels:\n job: \"syslog\"\n relabel_configs:\n - source_labels: ['__syslog_message_hostname']\n target_label: host\n - job_name: journal\n journal:\n path: /var/log/journal\n max_age: 12h\n labels:\n job: systemd-journal\n relabel_configs:\n - source_labels: ['__journal__systemd_unit']\n target_label: 'unit'\n - source_labels: ['__journal__hostname']\n target_label: 'hostname'\n \n\nlimits_config:\n \n\ntracing:\n enabled: false\n"
---
# Source: promtail/templates/clusterrole.yaml
kind: ClusterRole
@@ -129,15 +129,16 @@
app.kubernetes.io/name: promtail
app.kubernetes.io/instance: promtail
annotations:
- checksum/config: 0851d5695bfb82ba17dc02f957fcc38a47e303b7b922e4a220d679b3a611573d
+ checksum/config: fe2491ed94f3a7d53f6f9e39bb5482c8a9babc46067d2f70a06c0dd8b52cb5c1
spec:
serviceAccountName: promtail
+ enableServiceLinks: true
securityContext:
runAsGroup: 0
runAsUser: 0
containers:
- name: promtail
- image: "ghcr.io/k8s-at-home/promtail:2.6.1"
+ image: "ghcr.io/k8s-at-home/promtail:2.9.2"
imagePullPolicy: IfNotPresent
args:
- "-config.file=/etc/promtail/promtail.yaml"
@@ -176,7 +177,7 @@
readinessProbe:
failureThreshold: 5
httpGet:
- path: /ready
+ path: '/ready'
port: http-metrics
initialDelaySeconds: 10
periodSeconds: 10
@@ -213,7 +214,6 @@
kind: ServiceMonitor
metadata:
name: promtail
- namespace: default
labels:
app.kubernetes.io/name: promtail
app.kubernetes.io/instance: promtail
@@ -225,3 +225,4 @@
app.kubernetes.io/instance: promtail
endpoints:
- port: http-metrics
+ scheme: http |
c32e435
to
e6420c3
Compare
Path: @@ -20,7 +20,7 @@
app.kubernetes.io/instance: promtail
app.kubernetes.io/managed-by: Helm
stringData:
- promtail.yaml: "server:\n log_level: info\n http_listen_port: 3101\n \n\nclients:\n - url: http://loki-gateway/loki/api/v1/push\n\npositions:\n filename: /run/promtail/positions.yaml\n\nscrape_configs:\n # See also https://github.com/grafana/loki/blob/master/production/ksonnet/promtail/scrape_config.libsonnet for reference\n - job_name: kubernetes-pods\n pipeline_stages:\n - cri: {}\n kubernetes_sd_configs:\n - role: pod\n relabel_configs:\n - source_labels:\n - __meta_kubernetes_pod_controller_name\n regex: ([0-9a-z-.]+?)(-[0-9a-f]{8,10})?\n action: replace\n target_label: __tmp_controller_name\n - source_labels:\n - __meta_kubernetes_pod_label_app_kubernetes_io_name\n - __meta_kubernetes_pod_label_app\n - __tmp_controller_name\n - __meta_kubernetes_pod_name\n regex: ^;*([^;]+)(;.*)?$\n action: replace\n target_label: app\n - source_labels:\n - __meta_kubernetes_pod_label_app_kubernetes_io_instance\n - __meta_kubernetes_pod_label_release\n regex: ^;*([^;]+)(;.*)?$\n action: replace\n target_label: instance\n - source_labels:\n - __meta_kubernetes_pod_label_app_kubernetes_io_component\n - __meta_kubernetes_pod_label_component\n regex: ^;*([^;]+)(;.*)?$\n action: replace\n target_label: component\n - action: replace\n source_labels:\n - __meta_kubernetes_pod_node_name\n target_label: node_name\n - action: replace\n source_labels:\n - __meta_kubernetes_namespace\n target_label: namespace\n - action: replace\n replacement: $1\n separator: /\n source_labels:\n - namespace\n - app\n target_label: job\n - action: replace\n source_labels:\n - __meta_kubernetes_pod_name\n target_label: pod\n - action: replace\n source_labels:\n - __meta_kubernetes_pod_container_name\n target_label: container\n - action: replace\n replacement: /var/log/pods/*$1/*.log\n separator: /\n source_labels:\n - __meta_kubernetes_pod_uid\n - __meta_kubernetes_pod_container_name\n target_label: __path__\n - action: replace\n regex: true/(.*)\n replacement: /var/log/pods/*$1/*.log\n separator: /\n source_labels:\n - __meta_kubernetes_pod_annotationpresent_kubernetes_io_config_hash\n - __meta_kubernetes_pod_annotation_kubernetes_io_config_hash\n - __meta_kubernetes_pod_container_name\n target_label: __path__\n \n - job_name: syslog\n syslog:\n listen_address: 0.0.0.0:1514\n label_structured_data: true\n labels:\n job: \"syslog\"\n relabel_configs:\n - source_labels: ['__syslog_message_hostname']\n target_label: host\n - job_name: journal\n journal:\n path: /var/log/journal\n max_age: 12h\n labels:\n job: systemd-journal\n relabel_configs:\n - source_labels: ['__journal__systemd_unit']\n target_label: 'unit'\n - source_labels: ['__journal__hostname']\n target_label: 'hostname'\n \n\nlimits_config:\n"
+ promtail.yaml: "server:\n log_level: info\n log_format: logfmt\n http_listen_port: 3101\n \n\nclients:\n - url: http://loki-gateway/loki/api/v1/push\n\npositions:\n filename: /run/promtail/positions.yaml\n\nscrape_configs:\n # See also https://github.com/grafana/loki/blob/master/production/ksonnet/promtail/scrape_config.libsonnet for reference\n - job_name: kubernetes-pods\n pipeline_stages:\n - cri: {}\n kubernetes_sd_configs:\n - role: pod\n relabel_configs:\n - source_labels:\n - __meta_kubernetes_pod_controller_name\n regex: ([0-9a-z-.]+?)(-[0-9a-f]{8,10})?\n action: replace\n target_label: __tmp_controller_name\n - source_labels:\n - __meta_kubernetes_pod_label_app_kubernetes_io_name\n - __meta_kubernetes_pod_label_app\n - __tmp_controller_name\n - __meta_kubernetes_pod_name\n regex: ^;*([^;]+)(;.*)?$\n action: replace\n target_label: app\n - source_labels:\n - __meta_kubernetes_pod_label_app_kubernetes_io_instance\n - __meta_kubernetes_pod_label_instance\n regex: ^;*([^;]+)(;.*)?$\n action: replace\n target_label: instance\n - source_labels:\n - __meta_kubernetes_pod_label_app_kubernetes_io_component\n - __meta_kubernetes_pod_label_component\n regex: ^;*([^;]+)(;.*)?$\n action: replace\n target_label: component\n - action: replace\n source_labels:\n - __meta_kubernetes_pod_node_name\n target_label: node_name\n - action: replace\n source_labels:\n - __meta_kubernetes_namespace\n target_label: namespace\n - action: replace\n replacement: $1\n separator: /\n source_labels:\n - namespace\n - app\n target_label: job\n - action: replace\n source_labels:\n - __meta_kubernetes_pod_name\n target_label: pod\n - action: replace\n source_labels:\n - __meta_kubernetes_pod_container_name\n target_label: container\n - action: replace\n replacement: /var/log/pods/*$1/*.log\n separator: /\n source_labels:\n - __meta_kubernetes_pod_uid\n - __meta_kubernetes_pod_container_name\n target_label: __path__\n - action: replace\n regex: true/(.*)\n replacement: /var/log/pods/*$1/*.log\n separator: /\n source_labels:\n - __meta_kubernetes_pod_annotationpresent_kubernetes_io_config_hash\n - __meta_kubernetes_pod_annotation_kubernetes_io_config_hash\n - __meta_kubernetes_pod_container_name\n target_label: __path__\n \n - job_name: syslog\n syslog:\n listen_address: 0.0.0.0:1514\n label_structured_data: true\n labels:\n job: \"syslog\"\n relabel_configs:\n - source_labels: ['__syslog_message_hostname']\n target_label: host\n - job_name: journal\n journal:\n path: /var/log/journal\n max_age: 12h\n labels:\n job: systemd-journal\n relabel_configs:\n - source_labels: ['__journal__systemd_unit']\n target_label: 'unit'\n - source_labels: ['__journal__hostname']\n target_label: 'hostname'\n \n\nlimits_config:\n \n\ntracing:\n enabled: false\n"
---
# Source: promtail/templates/clusterrole.yaml
kind: ClusterRole
@@ -129,15 +129,16 @@
app.kubernetes.io/name: promtail
app.kubernetes.io/instance: promtail
annotations:
- checksum/config: 0851d5695bfb82ba17dc02f957fcc38a47e303b7b922e4a220d679b3a611573d
+ checksum/config: 2f4f712ad1bf8785110828b450fec6dc8ea74aa6b757e74f34914c50b6ab3deb
spec:
serviceAccountName: promtail
+ enableServiceLinks: true
securityContext:
runAsGroup: 0
runAsUser: 0
containers:
- name: promtail
- image: "ghcr.io/k8s-at-home/promtail:2.6.1"
+ image: "ghcr.io/k8s-at-home/promtail:2.9.3"
imagePullPolicy: IfNotPresent
args:
- "-config.file=/etc/promtail/promtail.yaml"
@@ -176,7 +177,7 @@
readinessProbe:
failureThreshold: 5
httpGet:
- path: /ready
+ path: '/ready'
port: http-metrics
initialDelaySeconds: 10
periodSeconds: 10
@@ -213,7 +214,6 @@
kind: ServiceMonitor
metadata:
name: promtail
- namespace: default
labels:
app.kubernetes.io/name: promtail
app.kubernetes.io/instance: promtail
@@ -225,3 +225,4 @@
app.kubernetes.io/instance: promtail
endpoints:
- port: http-metrics
+ scheme: http |
e6420c3
to
4d78023
Compare
Path: @@ -20,7 +20,7 @@
app.kubernetes.io/instance: promtail
app.kubernetes.io/managed-by: Helm
stringData:
- promtail.yaml: "server:\n log_level: info\n http_listen_port: 3101\n \n\nclients:\n - url: http://loki-gateway/loki/api/v1/push\n\npositions:\n filename: /run/promtail/positions.yaml\n\nscrape_configs:\n # See also https://github.com/grafana/loki/blob/master/production/ksonnet/promtail/scrape_config.libsonnet for reference\n - job_name: kubernetes-pods\n pipeline_stages:\n - cri: {}\n kubernetes_sd_configs:\n - role: pod\n relabel_configs:\n - source_labels:\n - __meta_kubernetes_pod_controller_name\n regex: ([0-9a-z-.]+?)(-[0-9a-f]{8,10})?\n action: replace\n target_label: __tmp_controller_name\n - source_labels:\n - __meta_kubernetes_pod_label_app_kubernetes_io_name\n - __meta_kubernetes_pod_label_app\n - __tmp_controller_name\n - __meta_kubernetes_pod_name\n regex: ^;*([^;]+)(;.*)?$\n action: replace\n target_label: app\n - source_labels:\n - __meta_kubernetes_pod_label_app_kubernetes_io_instance\n - __meta_kubernetes_pod_label_release\n regex: ^;*([^;]+)(;.*)?$\n action: replace\n target_label: instance\n - source_labels:\n - __meta_kubernetes_pod_label_app_kubernetes_io_component\n - __meta_kubernetes_pod_label_component\n regex: ^;*([^;]+)(;.*)?$\n action: replace\n target_label: component\n - action: replace\n source_labels:\n - __meta_kubernetes_pod_node_name\n target_label: node_name\n - action: replace\n source_labels:\n - __meta_kubernetes_namespace\n target_label: namespace\n - action: replace\n replacement: $1\n separator: /\n source_labels:\n - namespace\n - app\n target_label: job\n - action: replace\n source_labels:\n - __meta_kubernetes_pod_name\n target_label: pod\n - action: replace\n source_labels:\n - __meta_kubernetes_pod_container_name\n target_label: container\n - action: replace\n replacement: /var/log/pods/*$1/*.log\n separator: /\n source_labels:\n - __meta_kubernetes_pod_uid\n - __meta_kubernetes_pod_container_name\n target_label: __path__\n - action: replace\n regex: true/(.*)\n replacement: /var/log/pods/*$1/*.log\n separator: /\n source_labels:\n - __meta_kubernetes_pod_annotationpresent_kubernetes_io_config_hash\n - __meta_kubernetes_pod_annotation_kubernetes_io_config_hash\n - __meta_kubernetes_pod_container_name\n target_label: __path__\n \n - job_name: syslog\n syslog:\n listen_address: 0.0.0.0:1514\n label_structured_data: true\n labels:\n job: \"syslog\"\n relabel_configs:\n - source_labels: ['__syslog_message_hostname']\n target_label: host\n - job_name: journal\n journal:\n path: /var/log/journal\n max_age: 12h\n labels:\n job: systemd-journal\n relabel_configs:\n - source_labels: ['__journal__systemd_unit']\n target_label: 'unit'\n - source_labels: ['__journal__hostname']\n target_label: 'hostname'\n \n\nlimits_config:\n"
+ promtail.yaml: "server:\n log_level: info\n log_format: logfmt\n http_listen_port: 3101\n \n\nclients:\n - url: http://loki-gateway/loki/api/v1/push\n\npositions:\n filename: /run/promtail/positions.yaml\n\nscrape_configs:\n # See also https://github.com/grafana/loki/blob/master/production/ksonnet/promtail/scrape_config.libsonnet for reference\n - job_name: kubernetes-pods\n pipeline_stages:\n - cri: {}\n kubernetes_sd_configs:\n - role: pod\n relabel_configs:\n - source_labels:\n - __meta_kubernetes_pod_controller_name\n regex: ([0-9a-z-.]+?)(-[0-9a-f]{8,10})?\n action: replace\n target_label: __tmp_controller_name\n - source_labels:\n - __meta_kubernetes_pod_label_app_kubernetes_io_name\n - __meta_kubernetes_pod_label_app\n - __tmp_controller_name\n - __meta_kubernetes_pod_name\n regex: ^;*([^;]+)(;.*)?$\n action: replace\n target_label: app\n - source_labels:\n - __meta_kubernetes_pod_label_app_kubernetes_io_instance\n - __meta_kubernetes_pod_label_instance\n regex: ^;*([^;]+)(;.*)?$\n action: replace\n target_label: instance\n - source_labels:\n - __meta_kubernetes_pod_label_app_kubernetes_io_component\n - __meta_kubernetes_pod_label_component\n regex: ^;*([^;]+)(;.*)?$\n action: replace\n target_label: component\n - action: replace\n source_labels:\n - __meta_kubernetes_pod_node_name\n target_label: node_name\n - action: replace\n source_labels:\n - __meta_kubernetes_namespace\n target_label: namespace\n - action: replace\n replacement: $1\n separator: /\n source_labels:\n - namespace\n - app\n target_label: job\n - action: replace\n source_labels:\n - __meta_kubernetes_pod_name\n target_label: pod\n - action: replace\n source_labels:\n - __meta_kubernetes_pod_container_name\n target_label: container\n - action: replace\n replacement: /var/log/pods/*$1/*.log\n separator: /\n source_labels:\n - __meta_kubernetes_pod_uid\n - __meta_kubernetes_pod_container_name\n target_label: __path__\n - action: replace\n regex: true/(.*)\n replacement: /var/log/pods/*$1/*.log\n separator: /\n source_labels:\n - __meta_kubernetes_pod_annotationpresent_kubernetes_io_config_hash\n - __meta_kubernetes_pod_annotation_kubernetes_io_config_hash\n - __meta_kubernetes_pod_container_name\n target_label: __path__\n \n - job_name: syslog\n syslog:\n listen_address: 0.0.0.0:1514\n label_structured_data: true\n labels:\n job: \"syslog\"\n relabel_configs:\n - source_labels: ['__syslog_message_hostname']\n target_label: host\n - job_name: journal\n journal:\n path: /var/log/journal\n max_age: 12h\n labels:\n job: systemd-journal\n relabel_configs:\n - source_labels: ['__journal__systemd_unit']\n target_label: 'unit'\n - source_labels: ['__journal__hostname']\n target_label: 'hostname'\n \n\nlimits_config:\n \n\ntracing:\n enabled: false\n"
---
# Source: promtail/templates/clusterrole.yaml
kind: ClusterRole
@@ -129,15 +129,16 @@
app.kubernetes.io/name: promtail
app.kubernetes.io/instance: promtail
annotations:
- checksum/config: 0851d5695bfb82ba17dc02f957fcc38a47e303b7b922e4a220d679b3a611573d
+ checksum/config: 3ecde74041bc3d8fc9dfdf9a85892bacf7213ba0223947f125c2462690266879
spec:
serviceAccountName: promtail
+ enableServiceLinks: true
securityContext:
runAsGroup: 0
runAsUser: 0
containers:
- name: promtail
- image: "ghcr.io/k8s-at-home/promtail:2.6.1"
+ image: "ghcr.io/k8s-at-home/promtail:2.9.3"
imagePullPolicy: IfNotPresent
args:
- "-config.file=/etc/promtail/promtail.yaml"
@@ -176,7 +177,7 @@
readinessProbe:
failureThreshold: 5
httpGet:
- path: /ready
+ path: '/ready'
port: http-metrics
initialDelaySeconds: 10
periodSeconds: 10
@@ -213,7 +214,6 @@
kind: ServiceMonitor
metadata:
name: promtail
- namespace: default
labels:
app.kubernetes.io/name: promtail
app.kubernetes.io/instance: promtail
@@ -225,3 +225,4 @@
app.kubernetes.io/instance: promtail
endpoints:
- port: http-metrics
+ scheme: http |
4d78023
to
622292a
Compare
622292a
to
49c49e1
Compare
Path: @@ -20,7 +20,7 @@
app.kubernetes.io/instance: promtail
app.kubernetes.io/managed-by: Helm
stringData:
- promtail.yaml: "server:\n log_level: info\n http_listen_port: 3101\n \n\nclients:\n - url: http://loki-gateway/loki/api/v1/push\n\npositions:\n filename: /run/promtail/positions.yaml\n\nscrape_configs:\n # See also https://github.com/grafana/loki/blob/master/production/ksonnet/promtail/scrape_config.libsonnet for reference\n - job_name: kubernetes-pods\n pipeline_stages:\n - cri: {}\n kubernetes_sd_configs:\n - role: pod\n relabel_configs:\n - source_labels:\n - __meta_kubernetes_pod_controller_name\n regex: ([0-9a-z-.]+?)(-[0-9a-f]{8,10})?\n action: replace\n target_label: __tmp_controller_name\n - source_labels:\n - __meta_kubernetes_pod_label_app_kubernetes_io_name\n - __meta_kubernetes_pod_label_app\n - __tmp_controller_name\n - __meta_kubernetes_pod_name\n regex: ^;*([^;]+)(;.*)?$\n action: replace\n target_label: app\n - source_labels:\n - __meta_kubernetes_pod_label_app_kubernetes_io_instance\n - __meta_kubernetes_pod_label_release\n regex: ^;*([^;]+)(;.*)?$\n action: replace\n target_label: instance\n - source_labels:\n - __meta_kubernetes_pod_label_app_kubernetes_io_component\n - __meta_kubernetes_pod_label_component\n regex: ^;*([^;]+)(;.*)?$\n action: replace\n target_label: component\n - action: replace\n source_labels:\n - __meta_kubernetes_pod_node_name\n target_label: node_name\n - action: replace\n source_labels:\n - __meta_kubernetes_namespace\n target_label: namespace\n - action: replace\n replacement: $1\n separator: /\n source_labels:\n - namespace\n - app\n target_label: job\n - action: replace\n source_labels:\n - __meta_kubernetes_pod_name\n target_label: pod\n - action: replace\n source_labels:\n - __meta_kubernetes_pod_container_name\n target_label: container\n - action: replace\n replacement: /var/log/pods/*$1/*.log\n separator: /\n source_labels:\n - __meta_kubernetes_pod_uid\n - __meta_kubernetes_pod_container_name\n target_label: __path__\n - action: replace\n regex: true/(.*)\n replacement: /var/log/pods/*$1/*.log\n separator: /\n source_labels:\n - __meta_kubernetes_pod_annotationpresent_kubernetes_io_config_hash\n - __meta_kubernetes_pod_annotation_kubernetes_io_config_hash\n - __meta_kubernetes_pod_container_name\n target_label: __path__\n \n - job_name: syslog\n syslog:\n listen_address: 0.0.0.0:1514\n label_structured_data: true\n labels:\n job: \"syslog\"\n relabel_configs:\n - source_labels: ['__syslog_message_hostname']\n target_label: host\n - job_name: journal\n journal:\n path: /var/log/journal\n max_age: 12h\n labels:\n job: systemd-journal\n relabel_configs:\n - source_labels: ['__journal__systemd_unit']\n target_label: 'unit'\n - source_labels: ['__journal__hostname']\n target_label: 'hostname'\n \n\nlimits_config:\n"
+ promtail.yaml: "server:\n log_level: info\n log_format: logfmt\n http_listen_port: 3101\n \n\nclients:\n - url: http://loki-gateway/loki/api/v1/push\n\npositions:\n filename: /run/promtail/positions.yaml\n\nscrape_configs:\n # See also https://github.com/grafana/loki/blob/master/production/ksonnet/promtail/scrape_config.libsonnet for reference\n - job_name: kubernetes-pods\n pipeline_stages:\n - cri: {}\n kubernetes_sd_configs:\n - role: pod\n relabel_configs:\n - source_labels:\n - __meta_kubernetes_pod_controller_name\n regex: ([0-9a-z-.]+?)(-[0-9a-f]{8,10})?\n action: replace\n target_label: __tmp_controller_name\n - source_labels:\n - __meta_kubernetes_pod_label_app_kubernetes_io_name\n - __meta_kubernetes_pod_label_app\n - __tmp_controller_name\n - __meta_kubernetes_pod_name\n regex: ^;*([^;]+)(;.*)?$\n action: replace\n target_label: app\n - source_labels:\n - __meta_kubernetes_pod_label_app_kubernetes_io_instance\n - __meta_kubernetes_pod_label_instance\n regex: ^;*([^;]+)(;.*)?$\n action: replace\n target_label: instance\n - source_labels:\n - __meta_kubernetes_pod_label_app_kubernetes_io_component\n - __meta_kubernetes_pod_label_component\n regex: ^;*([^;]+)(;.*)?$\n action: replace\n target_label: component\n - action: replace\n source_labels:\n - __meta_kubernetes_pod_node_name\n target_label: node_name\n - action: replace\n source_labels:\n - __meta_kubernetes_namespace\n target_label: namespace\n - action: replace\n replacement: $1\n separator: /\n source_labels:\n - namespace\n - app\n target_label: job\n - action: replace\n source_labels:\n - __meta_kubernetes_pod_name\n target_label: pod\n - action: replace\n source_labels:\n - __meta_kubernetes_pod_container_name\n target_label: container\n - action: replace\n replacement: /var/log/pods/*$1/*.log\n separator: /\n source_labels:\n - __meta_kubernetes_pod_uid\n - __meta_kubernetes_pod_container_name\n target_label: __path__\n - action: replace\n regex: true/(.*)\n replacement: /var/log/pods/*$1/*.log\n separator: /\n source_labels:\n - __meta_kubernetes_pod_annotationpresent_kubernetes_io_config_hash\n - __meta_kubernetes_pod_annotation_kubernetes_io_config_hash\n - __meta_kubernetes_pod_container_name\n target_label: __path__\n \n - job_name: syslog\n syslog:\n listen_address: 0.0.0.0:1514\n label_structured_data: true\n labels:\n job: \"syslog\"\n relabel_configs:\n - source_labels: ['__syslog_message_hostname']\n target_label: host\n - job_name: journal\n journal:\n path: /var/log/journal\n max_age: 12h\n labels:\n job: systemd-journal\n relabel_configs:\n - source_labels: ['__journal__systemd_unit']\n target_label: 'unit'\n - source_labels: ['__journal__hostname']\n target_label: 'hostname'\n \n\nlimits_config:\n \n\ntracing:\n enabled: false\n"
---
# Source: promtail/templates/clusterrole.yaml
kind: ClusterRole
@@ -129,15 +129,16 @@
app.kubernetes.io/name: promtail
app.kubernetes.io/instance: promtail
annotations:
- checksum/config: 0851d5695bfb82ba17dc02f957fcc38a47e303b7b922e4a220d679b3a611573d
+ checksum/config: 3ecde74041bc3d8fc9dfdf9a85892bacf7213ba0223947f125c2462690266879
spec:
serviceAccountName: promtail
+ enableServiceLinks: true
securityContext:
runAsGroup: 0
runAsUser: 0
containers:
- name: promtail
- image: "ghcr.io/k8s-at-home/promtail:2.6.1"
+ image: "ghcr.io/k8s-at-home/promtail:3.0.0"
imagePullPolicy: IfNotPresent
args:
- "-config.file=/etc/promtail/promtail.yaml"
@@ -176,7 +177,7 @@
readinessProbe:
failureThreshold: 5
httpGet:
- path: /ready
+ path: '/ready'
port: http-metrics
initialDelaySeconds: 10
periodSeconds: 10
@@ -213,7 +214,6 @@
kind: ServiceMonitor
metadata:
name: promtail
- namespace: default
labels:
app.kubernetes.io/name: promtail
app.kubernetes.io/instance: promtail
@@ -225,3 +225,4 @@
app.kubernetes.io/instance: promtail
endpoints:
- port: http-metrics
+ scheme: http |
49c49e1
to
44d942e
Compare
Path: @@ -20,7 +20,7 @@
app.kubernetes.io/instance: promtail
app.kubernetes.io/managed-by: Helm
stringData:
- promtail.yaml: "server:\n log_level: info\n http_listen_port: 3101\n \n\nclients:\n - url: http://loki-gateway/loki/api/v1/push\n\npositions:\n filename: /run/promtail/positions.yaml\n\nscrape_configs:\n # See also https://github.com/grafana/loki/blob/master/production/ksonnet/promtail/scrape_config.libsonnet for reference\n - job_name: kubernetes-pods\n pipeline_stages:\n - cri: {}\n kubernetes_sd_configs:\n - role: pod\n relabel_configs:\n - source_labels:\n - __meta_kubernetes_pod_controller_name\n regex: ([0-9a-z-.]+?)(-[0-9a-f]{8,10})?\n action: replace\n target_label: __tmp_controller_name\n - source_labels:\n - __meta_kubernetes_pod_label_app_kubernetes_io_name\n - __meta_kubernetes_pod_label_app\n - __tmp_controller_name\n - __meta_kubernetes_pod_name\n regex: ^;*([^;]+)(;.*)?$\n action: replace\n target_label: app\n - source_labels:\n - __meta_kubernetes_pod_label_app_kubernetes_io_instance\n - __meta_kubernetes_pod_label_release\n regex: ^;*([^;]+)(;.*)?$\n action: replace\n target_label: instance\n - source_labels:\n - __meta_kubernetes_pod_label_app_kubernetes_io_component\n - __meta_kubernetes_pod_label_component\n regex: ^;*([^;]+)(;.*)?$\n action: replace\n target_label: component\n - action: replace\n source_labels:\n - __meta_kubernetes_pod_node_name\n target_label: node_name\n - action: replace\n source_labels:\n - __meta_kubernetes_namespace\n target_label: namespace\n - action: replace\n replacement: $1\n separator: /\n source_labels:\n - namespace\n - app\n target_label: job\n - action: replace\n source_labels:\n - __meta_kubernetes_pod_name\n target_label: pod\n - action: replace\n source_labels:\n - __meta_kubernetes_pod_container_name\n target_label: container\n - action: replace\n replacement: /var/log/pods/*$1/*.log\n separator: /\n source_labels:\n - __meta_kubernetes_pod_uid\n - __meta_kubernetes_pod_container_name\n target_label: __path__\n - action: replace\n regex: true/(.*)\n replacement: /var/log/pods/*$1/*.log\n separator: /\n source_labels:\n - __meta_kubernetes_pod_annotationpresent_kubernetes_io_config_hash\n - __meta_kubernetes_pod_annotation_kubernetes_io_config_hash\n - __meta_kubernetes_pod_container_name\n target_label: __path__\n \n - job_name: syslog\n syslog:\n listen_address: 0.0.0.0:1514\n label_structured_data: true\n labels:\n job: \"syslog\"\n relabel_configs:\n - source_labels: ['__syslog_message_hostname']\n target_label: host\n - job_name: journal\n journal:\n path: /var/log/journal\n max_age: 12h\n labels:\n job: systemd-journal\n relabel_configs:\n - source_labels: ['__journal__systemd_unit']\n target_label: 'unit'\n - source_labels: ['__journal__hostname']\n target_label: 'hostname'\n \n\nlimits_config:\n"
+ promtail.yaml: "server:\n log_level: info\n log_format: logfmt\n http_listen_port: 3101\n \n\nclients:\n - url: http://loki-gateway/loki/api/v1/push\n\npositions:\n filename: /run/promtail/positions.yaml\n\nscrape_configs:\n # See also https://github.com/grafana/loki/blob/master/production/ksonnet/promtail/scrape_config.libsonnet for reference\n - job_name: kubernetes-pods\n pipeline_stages:\n - cri: {}\n kubernetes_sd_configs:\n - role: pod\n relabel_configs:\n - source_labels:\n - __meta_kubernetes_pod_controller_name\n regex: ([0-9a-z-.]+?)(-[0-9a-f]{8,10})?\n action: replace\n target_label: __tmp_controller_name\n - source_labels:\n - __meta_kubernetes_pod_label_app_kubernetes_io_name\n - __meta_kubernetes_pod_label_app\n - __tmp_controller_name\n - __meta_kubernetes_pod_name\n regex: ^;*([^;]+)(;.*)?$\n action: replace\n target_label: app\n - source_labels:\n - __meta_kubernetes_pod_label_app_kubernetes_io_instance\n - __meta_kubernetes_pod_label_instance\n regex: ^;*([^;]+)(;.*)?$\n action: replace\n target_label: instance\n - source_labels:\n - __meta_kubernetes_pod_label_app_kubernetes_io_component\n - __meta_kubernetes_pod_label_component\n regex: ^;*([^;]+)(;.*)?$\n action: replace\n target_label: component\n - action: replace\n source_labels:\n - __meta_kubernetes_pod_node_name\n target_label: node_name\n - action: replace\n source_labels:\n - __meta_kubernetes_namespace\n target_label: namespace\n - action: replace\n replacement: $1\n separator: /\n source_labels:\n - namespace\n - app\n target_label: job\n - action: replace\n source_labels:\n - __meta_kubernetes_pod_name\n target_label: pod\n - action: replace\n source_labels:\n - __meta_kubernetes_pod_container_name\n target_label: container\n - action: replace\n replacement: /var/log/pods/*$1/*.log\n separator: /\n source_labels:\n - __meta_kubernetes_pod_uid\n - __meta_kubernetes_pod_container_name\n target_label: __path__\n - action: replace\n regex: true/(.*)\n replacement: /var/log/pods/*$1/*.log\n separator: /\n source_labels:\n - __meta_kubernetes_pod_annotationpresent_kubernetes_io_config_hash\n - __meta_kubernetes_pod_annotation_kubernetes_io_config_hash\n - __meta_kubernetes_pod_container_name\n target_label: __path__\n \n - job_name: syslog\n syslog:\n listen_address: 0.0.0.0:1514\n label_structured_data: true\n labels:\n job: \"syslog\"\n relabel_configs:\n - source_labels: ['__syslog_message_hostname']\n target_label: host\n - job_name: journal\n journal:\n path: /var/log/journal\n max_age: 12h\n labels:\n job: systemd-journal\n relabel_configs:\n - source_labels: ['__journal__systemd_unit']\n target_label: 'unit'\n - source_labels: ['__journal__hostname']\n target_label: 'hostname'\n \n\nlimits_config:\n \n\ntracing:\n enabled: false\n"
---
# Source: promtail/templates/clusterrole.yaml
kind: ClusterRole
@@ -129,15 +129,16 @@
app.kubernetes.io/name: promtail
app.kubernetes.io/instance: promtail
annotations:
- checksum/config: 0851d5695bfb82ba17dc02f957fcc38a47e303b7b922e4a220d679b3a611573d
+ checksum/config: 3ecde74041bc3d8fc9dfdf9a85892bacf7213ba0223947f125c2462690266879
spec:
serviceAccountName: promtail
+ enableServiceLinks: true
securityContext:
runAsGroup: 0
runAsUser: 0
containers:
- name: promtail
- image: "ghcr.io/k8s-at-home/promtail:2.6.1"
+ image: "ghcr.io/k8s-at-home/promtail:3.0.0"
imagePullPolicy: IfNotPresent
args:
- "-config.file=/etc/promtail/promtail.yaml"
@@ -176,7 +177,7 @@
readinessProbe:
failureThreshold: 5
httpGet:
- path: /ready
+ path: '/ready'
port: http-metrics
initialDelaySeconds: 10
periodSeconds: 10
@@ -213,7 +214,6 @@
kind: ServiceMonitor
metadata:
name: promtail
- namespace: default
labels:
app.kubernetes.io/name: promtail
app.kubernetes.io/instance: promtail
@@ -225,3 +225,4 @@
app.kubernetes.io/instance: promtail
endpoints:
- port: http-metrics
+ scheme: http |
44d942e
to
e7fb6a1
Compare
Path: @@ -20,7 +20,7 @@
app.kubernetes.io/instance: promtail
app.kubernetes.io/managed-by: Helm
stringData:
- promtail.yaml: "server:\n log_level: info\n http_listen_port: 3101\n \n\nclients:\n - url: http://loki-gateway/loki/api/v1/push\n\npositions:\n filename: /run/promtail/positions.yaml\n\nscrape_configs:\n # See also https://github.com/grafana/loki/blob/master/production/ksonnet/promtail/scrape_config.libsonnet for reference\n - job_name: kubernetes-pods\n pipeline_stages:\n - cri: {}\n kubernetes_sd_configs:\n - role: pod\n relabel_configs:\n - source_labels:\n - __meta_kubernetes_pod_controller_name\n regex: ([0-9a-z-.]+?)(-[0-9a-f]{8,10})?\n action: replace\n target_label: __tmp_controller_name\n - source_labels:\n - __meta_kubernetes_pod_label_app_kubernetes_io_name\n - __meta_kubernetes_pod_label_app\n - __tmp_controller_name\n - __meta_kubernetes_pod_name\n regex: ^;*([^;]+)(;.*)?$\n action: replace\n target_label: app\n - source_labels:\n - __meta_kubernetes_pod_label_app_kubernetes_io_instance\n - __meta_kubernetes_pod_label_release\n regex: ^;*([^;]+)(;.*)?$\n action: replace\n target_label: instance\n - source_labels:\n - __meta_kubernetes_pod_label_app_kubernetes_io_component\n - __meta_kubernetes_pod_label_component\n regex: ^;*([^;]+)(;.*)?$\n action: replace\n target_label: component\n - action: replace\n source_labels:\n - __meta_kubernetes_pod_node_name\n target_label: node_name\n - action: replace\n source_labels:\n - __meta_kubernetes_namespace\n target_label: namespace\n - action: replace\n replacement: $1\n separator: /\n source_labels:\n - namespace\n - app\n target_label: job\n - action: replace\n source_labels:\n - __meta_kubernetes_pod_name\n target_label: pod\n - action: replace\n source_labels:\n - __meta_kubernetes_pod_container_name\n target_label: container\n - action: replace\n replacement: /var/log/pods/*$1/*.log\n separator: /\n source_labels:\n - __meta_kubernetes_pod_uid\n - __meta_kubernetes_pod_container_name\n target_label: __path__\n - action: replace\n regex: true/(.*)\n replacement: /var/log/pods/*$1/*.log\n separator: /\n source_labels:\n - __meta_kubernetes_pod_annotationpresent_kubernetes_io_config_hash\n - __meta_kubernetes_pod_annotation_kubernetes_io_config_hash\n - __meta_kubernetes_pod_container_name\n target_label: __path__\n \n - job_name: syslog\n syslog:\n listen_address: 0.0.0.0:1514\n label_structured_data: true\n labels:\n job: \"syslog\"\n relabel_configs:\n - source_labels: ['__syslog_message_hostname']\n target_label: host\n - job_name: journal\n journal:\n path: /var/log/journal\n max_age: 12h\n labels:\n job: systemd-journal\n relabel_configs:\n - source_labels: ['__journal__systemd_unit']\n target_label: 'unit'\n - source_labels: ['__journal__hostname']\n target_label: 'hostname'\n \n\nlimits_config:\n"
+ promtail.yaml: "server:\n log_level: info\n log_format: logfmt\n http_listen_port: 3101\n \n\nclients:\n - url: http://loki-gateway/loki/api/v1/push\n\npositions:\n filename: /run/promtail/positions.yaml\n\nscrape_configs:\n # See also https://github.com/grafana/loki/blob/master/production/ksonnet/promtail/scrape_config.libsonnet for reference\n - job_name: kubernetes-pods\n pipeline_stages:\n - cri: {}\n kubernetes_sd_configs:\n - role: pod\n relabel_configs:\n - source_labels:\n - __meta_kubernetes_pod_controller_name\n regex: ([0-9a-z-.]+?)(-[0-9a-f]{8,10})?\n action: replace\n target_label: __tmp_controller_name\n - source_labels:\n - __meta_kubernetes_pod_label_app_kubernetes_io_name\n - __meta_kubernetes_pod_label_app\n - __tmp_controller_name\n - __meta_kubernetes_pod_name\n regex: ^;*([^;]+)(;.*)?$\n action: replace\n target_label: app\n - source_labels:\n - __meta_kubernetes_pod_label_app_kubernetes_io_instance\n - __meta_kubernetes_pod_label_instance\n regex: ^;*([^;]+)(;.*)?$\n action: replace\n target_label: instance\n - source_labels:\n - __meta_kubernetes_pod_label_app_kubernetes_io_component\n - __meta_kubernetes_pod_label_component\n regex: ^;*([^;]+)(;.*)?$\n action: replace\n target_label: component\n - action: replace\n source_labels:\n - __meta_kubernetes_pod_node_name\n target_label: node_name\n - action: replace\n source_labels:\n - __meta_kubernetes_namespace\n target_label: namespace\n - action: replace\n replacement: $1\n separator: /\n source_labels:\n - namespace\n - app\n target_label: job\n - action: replace\n source_labels:\n - __meta_kubernetes_pod_name\n target_label: pod\n - action: replace\n source_labels:\n - __meta_kubernetes_pod_container_name\n target_label: container\n - action: replace\n replacement: /var/log/pods/*$1/*.log\n separator: /\n source_labels:\n - __meta_kubernetes_pod_uid\n - __meta_kubernetes_pod_container_name\n target_label: __path__\n - action: replace\n regex: true/(.*)\n replacement: /var/log/pods/*$1/*.log\n separator: /\n source_labels:\n - __meta_kubernetes_pod_annotationpresent_kubernetes_io_config_hash\n - __meta_kubernetes_pod_annotation_kubernetes_io_config_hash\n - __meta_kubernetes_pod_container_name\n target_label: __path__\n \n - job_name: syslog\n syslog:\n listen_address: 0.0.0.0:1514\n label_structured_data: true\n labels:\n job: \"syslog\"\n relabel_configs:\n - source_labels: ['__syslog_message_hostname']\n target_label: host\n - job_name: journal\n journal:\n path: /var/log/journal\n max_age: 12h\n labels:\n job: systemd-journal\n relabel_configs:\n - source_labels: ['__journal__systemd_unit']\n target_label: 'unit'\n - source_labels: ['__journal__hostname']\n target_label: 'hostname'\n \n\nlimits_config:\n \n\ntracing:\n enabled: false\n"
---
# Source: promtail/templates/clusterrole.yaml
kind: ClusterRole
@@ -129,15 +129,16 @@
app.kubernetes.io/name: promtail
app.kubernetes.io/instance: promtail
annotations:
- checksum/config: 0851d5695bfb82ba17dc02f957fcc38a47e303b7b922e4a220d679b3a611573d
+ checksum/config: 3ecde74041bc3d8fc9dfdf9a85892bacf7213ba0223947f125c2462690266879
spec:
serviceAccountName: promtail
+ enableServiceLinks: true
securityContext:
runAsGroup: 0
runAsUser: 0
containers:
- name: promtail
- image: "ghcr.io/k8s-at-home/promtail:2.6.1"
+ image: "ghcr.io/k8s-at-home/promtail:3.0.0"
imagePullPolicy: IfNotPresent
args:
- "-config.file=/etc/promtail/promtail.yaml"
@@ -176,7 +177,7 @@
readinessProbe:
failureThreshold: 5
httpGet:
- path: /ready
+ path: '/ready'
port: http-metrics
initialDelaySeconds: 10
periodSeconds: 10
@@ -213,7 +214,6 @@
kind: ServiceMonitor
metadata:
name: promtail
- namespace: default
labels:
app.kubernetes.io/name: promtail
app.kubernetes.io/instance: promtail
@@ -225,3 +225,4 @@
app.kubernetes.io/instance: promtail
endpoints:
- port: http-metrics
+ scheme: http |
e7fb6a1
to
55a1d86
Compare
Path: @@ -20,7 +20,7 @@
app.kubernetes.io/instance: promtail
app.kubernetes.io/managed-by: Helm
stringData:
- promtail.yaml: "server:\n log_level: info\n http_listen_port: 3101\n \n\nclients:\n - url: http://loki-gateway/loki/api/v1/push\n\npositions:\n filename: /run/promtail/positions.yaml\n\nscrape_configs:\n # See also https://github.com/grafana/loki/blob/master/production/ksonnet/promtail/scrape_config.libsonnet for reference\n - job_name: kubernetes-pods\n pipeline_stages:\n - cri: {}\n kubernetes_sd_configs:\n - role: pod\n relabel_configs:\n - source_labels:\n - __meta_kubernetes_pod_controller_name\n regex: ([0-9a-z-.]+?)(-[0-9a-f]{8,10})?\n action: replace\n target_label: __tmp_controller_name\n - source_labels:\n - __meta_kubernetes_pod_label_app_kubernetes_io_name\n - __meta_kubernetes_pod_label_app\n - __tmp_controller_name\n - __meta_kubernetes_pod_name\n regex: ^;*([^;]+)(;.*)?$\n action: replace\n target_label: app\n - source_labels:\n - __meta_kubernetes_pod_label_app_kubernetes_io_instance\n - __meta_kubernetes_pod_label_release\n regex: ^;*([^;]+)(;.*)?$\n action: replace\n target_label: instance\n - source_labels:\n - __meta_kubernetes_pod_label_app_kubernetes_io_component\n - __meta_kubernetes_pod_label_component\n regex: ^;*([^;]+)(;.*)?$\n action: replace\n target_label: component\n - action: replace\n source_labels:\n - __meta_kubernetes_pod_node_name\n target_label: node_name\n - action: replace\n source_labels:\n - __meta_kubernetes_namespace\n target_label: namespace\n - action: replace\n replacement: $1\n separator: /\n source_labels:\n - namespace\n - app\n target_label: job\n - action: replace\n source_labels:\n - __meta_kubernetes_pod_name\n target_label: pod\n - action: replace\n source_labels:\n - __meta_kubernetes_pod_container_name\n target_label: container\n - action: replace\n replacement: /var/log/pods/*$1/*.log\n separator: /\n source_labels:\n - __meta_kubernetes_pod_uid\n - __meta_kubernetes_pod_container_name\n target_label: __path__\n - action: replace\n regex: true/(.*)\n replacement: /var/log/pods/*$1/*.log\n separator: /\n source_labels:\n - __meta_kubernetes_pod_annotationpresent_kubernetes_io_config_hash\n - __meta_kubernetes_pod_annotation_kubernetes_io_config_hash\n - __meta_kubernetes_pod_container_name\n target_label: __path__\n \n - job_name: syslog\n syslog:\n listen_address: 0.0.0.0:1514\n label_structured_data: true\n labels:\n job: \"syslog\"\n relabel_configs:\n - source_labels: ['__syslog_message_hostname']\n target_label: host\n - job_name: journal\n journal:\n path: /var/log/journal\n max_age: 12h\n labels:\n job: systemd-journal\n relabel_configs:\n - source_labels: ['__journal__systemd_unit']\n target_label: 'unit'\n - source_labels: ['__journal__hostname']\n target_label: 'hostname'\n \n\nlimits_config:\n"
+ promtail.yaml: "server:\n log_level: info\n log_format: logfmt\n http_listen_port: 3101\n \n\nclients:\n - url: http://loki-gateway/loki/api/v1/push\n\npositions:\n filename: /run/promtail/positions.yaml\n\nscrape_configs:\n # See also https://github.com/grafana/loki/blob/master/production/ksonnet/promtail/scrape_config.libsonnet for reference\n - job_name: kubernetes-pods\n pipeline_stages:\n - cri: {}\n kubernetes_sd_configs:\n - role: pod\n relabel_configs:\n - source_labels:\n - __meta_kubernetes_pod_controller_name\n regex: ([0-9a-z-.]+?)(-[0-9a-f]{8,10})?\n action: replace\n target_label: __tmp_controller_name\n - source_labels:\n - __meta_kubernetes_pod_label_app_kubernetes_io_name\n - __meta_kubernetes_pod_label_app\n - __tmp_controller_name\n - __meta_kubernetes_pod_name\n regex: ^;*([^;]+)(;.*)?$\n action: replace\n target_label: app\n - source_labels:\n - __meta_kubernetes_pod_label_app_kubernetes_io_instance\n - __meta_kubernetes_pod_label_instance\n regex: ^;*([^;]+)(;.*)?$\n action: replace\n target_label: instance\n - source_labels:\n - __meta_kubernetes_pod_label_app_kubernetes_io_component\n - __meta_kubernetes_pod_label_component\n regex: ^;*([^;]+)(;.*)?$\n action: replace\n target_label: component\n - action: replace\n source_labels:\n - __meta_kubernetes_pod_node_name\n target_label: node_name\n - action: replace\n source_labels:\n - __meta_kubernetes_namespace\n target_label: namespace\n - action: replace\n replacement: $1\n separator: /\n source_labels:\n - namespace\n - app\n target_label: job\n - action: replace\n source_labels:\n - __meta_kubernetes_pod_name\n target_label: pod\n - action: replace\n source_labels:\n - __meta_kubernetes_pod_container_name\n target_label: container\n - action: replace\n replacement: /var/log/pods/*$1/*.log\n separator: /\n source_labels:\n - __meta_kubernetes_pod_uid\n - __meta_kubernetes_pod_container_name\n target_label: __path__\n - action: replace\n regex: true/(.*)\n replacement: /var/log/pods/*$1/*.log\n separator: /\n source_labels:\n - __meta_kubernetes_pod_annotationpresent_kubernetes_io_config_hash\n - __meta_kubernetes_pod_annotation_kubernetes_io_config_hash\n - __meta_kubernetes_pod_container_name\n target_label: __path__\n \n - job_name: syslog\n syslog:\n listen_address: 0.0.0.0:1514\n label_structured_data: true\n labels:\n job: \"syslog\"\n relabel_configs:\n - source_labels: ['__syslog_message_hostname']\n target_label: host\n - job_name: journal\n journal:\n path: /var/log/journal\n max_age: 12h\n labels:\n job: systemd-journal\n relabel_configs:\n - source_labels: ['__journal__systemd_unit']\n target_label: 'unit'\n - source_labels: ['__journal__hostname']\n target_label: 'hostname'\n \n\nlimits_config:\n \n\ntracing:\n enabled: false\n"
---
# Source: promtail/templates/clusterrole.yaml
kind: ClusterRole
@@ -129,15 +129,16 @@
app.kubernetes.io/name: promtail
app.kubernetes.io/instance: promtail
annotations:
- checksum/config: 0851d5695bfb82ba17dc02f957fcc38a47e303b7b922e4a220d679b3a611573d
+ checksum/config: 3ecde74041bc3d8fc9dfdf9a85892bacf7213ba0223947f125c2462690266879
spec:
serviceAccountName: promtail
+ enableServiceLinks: true
securityContext:
runAsGroup: 0
runAsUser: 0
containers:
- name: promtail
- image: "ghcr.io/k8s-at-home/promtail:2.6.1"
+ image: "ghcr.io/k8s-at-home/promtail:3.0.0"
imagePullPolicy: IfNotPresent
args:
- "-config.file=/etc/promtail/promtail.yaml"
@@ -176,7 +177,7 @@
readinessProbe:
failureThreshold: 5
httpGet:
- path: /ready
+ path: '/ready'
port: http-metrics
initialDelaySeconds: 10
periodSeconds: 10
@@ -213,7 +214,6 @@
kind: ServiceMonitor
metadata:
name: promtail
- namespace: default
labels:
app.kubernetes.io/name: promtail
app.kubernetes.io/instance: promtail
@@ -225,3 +225,4 @@
app.kubernetes.io/instance: promtail
endpoints:
- port: http-metrics
+ scheme: http |
55a1d86
to
7ae7fd8
Compare
Path: @@ -8,6 +8,7 @@
app.kubernetes.io/name: promtail
app.kubernetes.io/instance: promtail
app.kubernetes.io/managed-by: Helm
+automountServiceAccountToken: true
---
# Source: promtail/templates/secret.yaml
apiVersion: v1
@@ -20,7 +21,7 @@
app.kubernetes.io/instance: promtail
app.kubernetes.io/managed-by: Helm
stringData:
- promtail.yaml: "server:\n log_level: info\n http_listen_port: 3101\n \n\nclients:\n - url: http://loki-gateway/loki/api/v1/push\n\npositions:\n filename: /run/promtail/positions.yaml\n\nscrape_configs:\n # See also https://github.com/grafana/loki/blob/master/production/ksonnet/promtail/scrape_config.libsonnet for reference\n - job_name: kubernetes-pods\n pipeline_stages:\n - cri: {}\n kubernetes_sd_configs:\n - role: pod\n relabel_configs:\n - source_labels:\n - __meta_kubernetes_pod_controller_name\n regex: ([0-9a-z-.]+?)(-[0-9a-f]{8,10})?\n action: replace\n target_label: __tmp_controller_name\n - source_labels:\n - __meta_kubernetes_pod_label_app_kubernetes_io_name\n - __meta_kubernetes_pod_label_app\n - __tmp_controller_name\n - __meta_kubernetes_pod_name\n regex: ^;*([^;]+)(;.*)?$\n action: replace\n target_label: app\n - source_labels:\n - __meta_kubernetes_pod_label_app_kubernetes_io_instance\n - __meta_kubernetes_pod_label_release\n regex: ^;*([^;]+)(;.*)?$\n action: replace\n target_label: instance\n - source_labels:\n - __meta_kubernetes_pod_label_app_kubernetes_io_component\n - __meta_kubernetes_pod_label_component\n regex: ^;*([^;]+)(;.*)?$\n action: replace\n target_label: component\n - action: replace\n source_labels:\n - __meta_kubernetes_pod_node_name\n target_label: node_name\n - action: replace\n source_labels:\n - __meta_kubernetes_namespace\n target_label: namespace\n - action: replace\n replacement: $1\n separator: /\n source_labels:\n - namespace\n - app\n target_label: job\n - action: replace\n source_labels:\n - __meta_kubernetes_pod_name\n target_label: pod\n - action: replace\n source_labels:\n - __meta_kubernetes_pod_container_name\n target_label: container\n - action: replace\n replacement: /var/log/pods/*$1/*.log\n separator: /\n source_labels:\n - __meta_kubernetes_pod_uid\n - __meta_kubernetes_pod_container_name\n target_label: __path__\n - action: replace\n regex: true/(.*)\n replacement: /var/log/pods/*$1/*.log\n separator: /\n source_labels:\n - __meta_kubernetes_pod_annotationpresent_kubernetes_io_config_hash\n - __meta_kubernetes_pod_annotation_kubernetes_io_config_hash\n - __meta_kubernetes_pod_container_name\n target_label: __path__\n \n - job_name: syslog\n syslog:\n listen_address: 0.0.0.0:1514\n label_structured_data: true\n labels:\n job: \"syslog\"\n relabel_configs:\n - source_labels: ['__syslog_message_hostname']\n target_label: host\n - job_name: journal\n journal:\n path: /var/log/journal\n max_age: 12h\n labels:\n job: systemd-journal\n relabel_configs:\n - source_labels: ['__journal__systemd_unit']\n target_label: 'unit'\n - source_labels: ['__journal__hostname']\n target_label: 'hostname'\n \n\nlimits_config:\n"
+ promtail.yaml: "server:\n log_level: info\n log_format: logfmt\n http_listen_port: 3101\n \n\nclients:\n - url: http://loki-gateway/loki/api/v1/push\n\npositions:\n filename: /run/promtail/positions.yaml\n\nscrape_configs:\n # See also https://github.com/grafana/loki/blob/master/production/ksonnet/promtail/scrape_config.libsonnet for reference\n - job_name: kubernetes-pods\n pipeline_stages:\n - cri: {}\n kubernetes_sd_configs:\n - role: pod\n relabel_configs:\n - source_labels:\n - __meta_kubernetes_pod_controller_name\n regex: ([0-9a-z-.]+?)(-[0-9a-f]{8,10})?\n action: replace\n target_label: __tmp_controller_name\n - source_labels:\n - __meta_kubernetes_pod_label_app_kubernetes_io_name\n - __meta_kubernetes_pod_label_app\n - __tmp_controller_name\n - __meta_kubernetes_pod_name\n regex: ^;*([^;]+)(;.*)?$\n action: replace\n target_label: app\n - source_labels:\n - __meta_kubernetes_pod_label_app_kubernetes_io_instance\n - __meta_kubernetes_pod_label_instance\n regex: ^;*([^;]+)(;.*)?$\n action: replace\n target_label: instance\n - source_labels:\n - __meta_kubernetes_pod_label_app_kubernetes_io_component\n - __meta_kubernetes_pod_label_component\n regex: ^;*([^;]+)(;.*)?$\n action: replace\n target_label: component\n - action: replace\n source_labels:\n - __meta_kubernetes_pod_node_name\n target_label: node_name\n - action: replace\n source_labels:\n - __meta_kubernetes_namespace\n target_label: namespace\n - action: replace\n replacement: $1\n separator: /\n source_labels:\n - namespace\n - app\n target_label: job\n - action: replace\n source_labels:\n - __meta_kubernetes_pod_name\n target_label: pod\n - action: replace\n source_labels:\n - __meta_kubernetes_pod_container_name\n target_label: container\n - action: replace\n replacement: /var/log/pods/*$1/*.log\n separator: /\n source_labels:\n - __meta_kubernetes_pod_uid\n - __meta_kubernetes_pod_container_name\n target_label: __path__\n - action: replace\n regex: true/(.*)\n replacement: /var/log/pods/*$1/*.log\n separator: /\n source_labels:\n - __meta_kubernetes_pod_annotationpresent_kubernetes_io_config_hash\n - __meta_kubernetes_pod_annotation_kubernetes_io_config_hash\n - __meta_kubernetes_pod_container_name\n target_label: __path__\n \n - job_name: syslog\n syslog:\n listen_address: 0.0.0.0:1514\n label_structured_data: true\n labels:\n job: \"syslog\"\n relabel_configs:\n - source_labels: ['__syslog_message_hostname']\n target_label: host\n - job_name: journal\n journal:\n path: /var/log/journal\n max_age: 12h\n labels:\n job: systemd-journal\n relabel_configs:\n - source_labels: ['__journal__systemd_unit']\n target_label: 'unit'\n - source_labels: ['__journal__hostname']\n target_label: 'hostname'\n \n\nlimits_config:\n \n\ntracing:\n enabled: false\n"
---
# Source: promtail/templates/clusterrole.yaml
kind: ClusterRole
@@ -129,15 +130,17 @@
app.kubernetes.io/name: promtail
app.kubernetes.io/instance: promtail
annotations:
- checksum/config: 0851d5695bfb82ba17dc02f957fcc38a47e303b7b922e4a220d679b3a611573d
+ checksum/config: 3ecde74041bc3d8fc9dfdf9a85892bacf7213ba0223947f125c2462690266879
spec:
serviceAccountName: promtail
+ automountServiceAccountToken: true
+ enableServiceLinks: true
securityContext:
runAsGroup: 0
runAsUser: 0
containers:
- name: promtail
- image: "ghcr.io/k8s-at-home/promtail:2.6.1"
+ image: "ghcr.io/k8s-at-home/promtail:3.0.0"
imagePullPolicy: IfNotPresent
args:
- "-config.file=/etc/promtail/promtail.yaml"
@@ -176,7 +179,7 @@
readinessProbe:
failureThreshold: 5
httpGet:
- path: /ready
+ path: '/ready'
port: http-metrics
initialDelaySeconds: 10
periodSeconds: 10
@@ -213,7 +216,6 @@
kind: ServiceMonitor
metadata:
name: promtail
- namespace: default
labels:
app.kubernetes.io/name: promtail
app.kubernetes.io/instance: promtail
@@ -225,3 +227,4 @@
app.kubernetes.io/instance: promtail
endpoints:
- port: http-metrics
+ scheme: http |
Signed-off-by: Danny Froberg <[email protected]>
7ae7fd8
to
1d05cde
Compare
Path: @@ -8,6 +8,7 @@
app.kubernetes.io/name: promtail
app.kubernetes.io/instance: promtail
app.kubernetes.io/managed-by: Helm
+automountServiceAccountToken: true
---
# Source: promtail/templates/secret.yaml
apiVersion: v1
@@ -20,7 +21,7 @@
app.kubernetes.io/instance: promtail
app.kubernetes.io/managed-by: Helm
stringData:
- promtail.yaml: "server:\n log_level: info\n http_listen_port: 3101\n \n\nclients:\n - url: http://loki-gateway/loki/api/v1/push\n\npositions:\n filename: /run/promtail/positions.yaml\n\nscrape_configs:\n # See also https://github.com/grafana/loki/blob/master/production/ksonnet/promtail/scrape_config.libsonnet for reference\n - job_name: kubernetes-pods\n pipeline_stages:\n - cri: {}\n kubernetes_sd_configs:\n - role: pod\n relabel_configs:\n - source_labels:\n - __meta_kubernetes_pod_controller_name\n regex: ([0-9a-z-.]+?)(-[0-9a-f]{8,10})?\n action: replace\n target_label: __tmp_controller_name\n - source_labels:\n - __meta_kubernetes_pod_label_app_kubernetes_io_name\n - __meta_kubernetes_pod_label_app\n - __tmp_controller_name\n - __meta_kubernetes_pod_name\n regex: ^;*([^;]+)(;.*)?$\n action: replace\n target_label: app\n - source_labels:\n - __meta_kubernetes_pod_label_app_kubernetes_io_instance\n - __meta_kubernetes_pod_label_release\n regex: ^;*([^;]+)(;.*)?$\n action: replace\n target_label: instance\n - source_labels:\n - __meta_kubernetes_pod_label_app_kubernetes_io_component\n - __meta_kubernetes_pod_label_component\n regex: ^;*([^;]+)(;.*)?$\n action: replace\n target_label: component\n - action: replace\n source_labels:\n - __meta_kubernetes_pod_node_name\n target_label: node_name\n - action: replace\n source_labels:\n - __meta_kubernetes_namespace\n target_label: namespace\n - action: replace\n replacement: $1\n separator: /\n source_labels:\n - namespace\n - app\n target_label: job\n - action: replace\n source_labels:\n - __meta_kubernetes_pod_name\n target_label: pod\n - action: replace\n source_labels:\n - __meta_kubernetes_pod_container_name\n target_label: container\n - action: replace\n replacement: /var/log/pods/*$1/*.log\n separator: /\n source_labels:\n - __meta_kubernetes_pod_uid\n - __meta_kubernetes_pod_container_name\n target_label: __path__\n - action: replace\n regex: true/(.*)\n replacement: /var/log/pods/*$1/*.log\n separator: /\n source_labels:\n - __meta_kubernetes_pod_annotationpresent_kubernetes_io_config_hash\n - __meta_kubernetes_pod_annotation_kubernetes_io_config_hash\n - __meta_kubernetes_pod_container_name\n target_label: __path__\n \n - job_name: syslog\n syslog:\n listen_address: 0.0.0.0:1514\n label_structured_data: true\n labels:\n job: \"syslog\"\n relabel_configs:\n - source_labels: ['__syslog_message_hostname']\n target_label: host\n - job_name: journal\n journal:\n path: /var/log/journal\n max_age: 12h\n labels:\n job: systemd-journal\n relabel_configs:\n - source_labels: ['__journal__systemd_unit']\n target_label: 'unit'\n - source_labels: ['__journal__hostname']\n target_label: 'hostname'\n \n\nlimits_config:\n"
+ promtail.yaml: "server:\n log_level: info\n log_format: logfmt\n http_listen_port: 3101\n \n\nclients:\n - url: http://loki-gateway/loki/api/v1/push\n\npositions:\n filename: /run/promtail/positions.yaml\n\nscrape_configs:\n # See also https://github.com/grafana/loki/blob/master/production/ksonnet/promtail/scrape_config.libsonnet for reference\n - job_name: kubernetes-pods\n pipeline_stages:\n - cri: {}\n kubernetes_sd_configs:\n - role: pod\n relabel_configs:\n - source_labels:\n - __meta_kubernetes_pod_controller_name\n regex: ([0-9a-z-.]+?)(-[0-9a-f]{8,10})?\n action: replace\n target_label: __tmp_controller_name\n - source_labels:\n - __meta_kubernetes_pod_label_app_kubernetes_io_name\n - __meta_kubernetes_pod_label_app\n - __tmp_controller_name\n - __meta_kubernetes_pod_name\n regex: ^;*([^;]+)(;.*)?$\n action: replace\n target_label: app\n - source_labels:\n - __meta_kubernetes_pod_label_app_kubernetes_io_instance\n - __meta_kubernetes_pod_label_instance\n regex: ^;*([^;]+)(;.*)?$\n action: replace\n target_label: instance\n - source_labels:\n - __meta_kubernetes_pod_label_app_kubernetes_io_component\n - __meta_kubernetes_pod_label_component\n regex: ^;*([^;]+)(;.*)?$\n action: replace\n target_label: component\n - action: replace\n source_labels:\n - __meta_kubernetes_pod_node_name\n target_label: node_name\n - action: replace\n source_labels:\n - __meta_kubernetes_namespace\n target_label: namespace\n - action: replace\n replacement: $1\n separator: /\n source_labels:\n - namespace\n - app\n target_label: job\n - action: replace\n source_labels:\n - __meta_kubernetes_pod_name\n target_label: pod\n - action: replace\n source_labels:\n - __meta_kubernetes_pod_container_name\n target_label: container\n - action: replace\n replacement: /var/log/pods/*$1/*.log\n separator: /\n source_labels:\n - __meta_kubernetes_pod_uid\n - __meta_kubernetes_pod_container_name\n target_label: __path__\n - action: replace\n regex: true/(.*)\n replacement: /var/log/pods/*$1/*.log\n separator: /\n source_labels:\n - __meta_kubernetes_pod_annotationpresent_kubernetes_io_config_hash\n - __meta_kubernetes_pod_annotation_kubernetes_io_config_hash\n - __meta_kubernetes_pod_container_name\n target_label: __path__\n \n - job_name: syslog\n syslog:\n listen_address: 0.0.0.0:1514\n label_structured_data: true\n labels:\n job: \"syslog\"\n relabel_configs:\n - source_labels: ['__syslog_message_hostname']\n target_label: host\n - job_name: journal\n journal:\n path: /var/log/journal\n max_age: 12h\n labels:\n job: systemd-journal\n relabel_configs:\n - source_labels: ['__journal__systemd_unit']\n target_label: 'unit'\n - source_labels: ['__journal__hostname']\n target_label: 'hostname'\n \n\nlimits_config:\n \n\ntracing:\n enabled: false\n"
---
# Source: promtail/templates/clusterrole.yaml
kind: ClusterRole
@@ -129,15 +130,17 @@
app.kubernetes.io/name: promtail
app.kubernetes.io/instance: promtail
annotations:
- checksum/config: 0851d5695bfb82ba17dc02f957fcc38a47e303b7b922e4a220d679b3a611573d
+ checksum/config: 3ecde74041bc3d8fc9dfdf9a85892bacf7213ba0223947f125c2462690266879
spec:
serviceAccountName: promtail
+ automountServiceAccountToken: true
+ enableServiceLinks: true
securityContext:
runAsGroup: 0
runAsUser: 0
containers:
- name: promtail
- image: "ghcr.io/k8s-at-home/promtail:2.6.1"
+ image: "ghcr.io/k8s-at-home/promtail:3.0.0"
imagePullPolicy: IfNotPresent
args:
- "-config.file=/etc/promtail/promtail.yaml"
@@ -176,7 +179,7 @@
readinessProbe:
failureThreshold: 5
httpGet:
- path: /ready
+ path: '/ready'
port: http-metrics
initialDelaySeconds: 10
periodSeconds: 10
@@ -213,7 +216,6 @@
kind: ServiceMonitor
metadata:
name: promtail
- namespace: default
labels:
app.kubernetes.io/name: promtail
app.kubernetes.io/instance: promtail
@@ -225,3 +227,4 @@
app.kubernetes.io/instance: promtail
endpoints:
- port: http-metrics
+ scheme: http |
This PR contains the following updates:
6.5.0
->6.16.6
Warning
Some dependencies could not be looked up. Check the Dependency Dashboard for more information.
Release Notes
grafana/helm-charts (promtail)
v6.16.6
Compare Source
Promtail is an agent which ships the contents of local logs to a Loki instance
What's Changed
New Contributors
Full Changelog: grafana/helm-charts@grafana-agent-operator-0.4.2...promtail-6.16.6
v6.16.5
Compare Source
Promtail is an agent which ships the contents of local logs to a Loki instance
What's Changed
Full Changelog: grafana/helm-charts@grafana-sampling-1.0.1...promtail-6.16.5
v6.16.4
Compare Source
Promtail is an agent which ships the contents of local logs to a Loki instance
What's Changed
New Contributors
Full Changelog: grafana/helm-charts@oncall-1.8.4...promtail-6.16.4
v6.16.3
Compare Source
Promtail is an agent which ships the contents of local logs to a Loki instance
What's Changed
New Contributors
Full Changelog: grafana/helm-charts@grafana-8.3.1...promtail-6.16.3
v6.16.2
Compare Source
Promtail is an agent which ships the contents of local logs to a Loki instance
What's Changed
Full Changelog: grafana/helm-charts@tempo-distributed-1.12.0...promtail-6.16.2
v6.16.1
Compare Source
Promtail is an agent which ships the contents of local logs to a Loki instance
What's Changed
Full Changelog: grafana/helm-charts@helm-loki-6.6.4...promtail-6.16.1
v6.16.0
Compare Source
Promtail is an agent which ships the contents of local logs to a Loki instance
What's Changed
New Contributors
Full Changelog: grafana/helm-charts@grafana-agent-operator-0.4.0...promtail-6.16.0
v6.15.5
Compare Source
Promtail is an agent which ships the contents of local logs to a Loki instance
What's Changed
Full Changelog: grafana/helm-charts@grafana-7.2.5...promtail-6.15.5
v6.15.4
Compare Source
Promtail is an agent which ships the contents of local logs to a Loki instance
What's Changed
Full Changelog: grafana/helm-charts@tempo-distributed-1.8.1...promtail-6.15.4
v6.15.3
Compare Source
Promtail is an agent which ships the contents of local logs to a Loki instance
What's Changed
Full Changelog: grafana/helm-charts@loki-distributed-0.76.0...promtail-6.15.3
v6.15.2
Compare Source
Promtail is an agent which ships the contents of local logs to a Loki instance
What's Changed
New Contributors
Full Changelog: grafana/helm-charts@loki-distributed-0.74.3...promtail-6.15.2
v6.15.1
Compare Source
Promtail is an agent which ships the contents of local logs to a Loki instance
What's Changed
Full Changelog: grafana/helm-charts@grafana-6.59.1...promtail-6.15.1
v6.15.0
Compare Source
Helm chart for Grafana Loki and Grafana Enterprise Logs supporting both simple, scalable and distributed modes
Source commit: grafana/loki@03a1eba
Tag on source: https://github.com/grafana/loki/releases/tag/helm-loki-6.15.0
v6.14.1
Compare Source
Promtail is an agent which ships the contents of local logs to a Loki instance
What's Changed
New Contributors
Full Changelog: grafana/helm-charts@oncall-1.3.22...promtail-6.14.1
v6.14.0
Compare Source
Promtail is an agent which ships the contents of local logs to a Loki instance
What's Changed
Full Changelog: grafana/helm-charts@tempo-1.5.0...promtail-6.14.0
v6.13.1
Compare Source
Promtail is an agent which ships the contents of local logs to a Loki instance
What's Changed
New Contributors
Full Changelog: grafana/helm-charts@oncall-1.3.21...promtail-6.13.1
v6.13.0
Compare Source
Promtail is an agent which ships the contents of local logs to a Loki instance
What's Changed
New Contributors
Full Changelog: grafana/helm-charts@tempo-distributed-1.5.3...promtail-6.13.0
v6.12.0
Compare Source
Promtail is an agent which ships the contents of local logs to a Loki instance
What's Changed
Full Changelog: grafana/helm-charts@grafana-agent-operator-0.3.0...promtail-6.12.0
v6.11.9
Compare Source
Promtail is an agent which ships the contents of local logs to a Loki instance
What's Changed
New Contributors
Full Changelog: grafana/helm-charts@helm-loki-5.9.0...promtail-6.11.9
v6.11.8
Compare Source
Promtail is an agent which ships the contents of local logs to a Loki instance
What's Changed
New Contributors
Full Changelog: grafana/helm-charts@loki-distributed-0.70.0...promtail-6.11.8
v6.11.7
Compare Source
Promtail is an agent which ships the contents of local logs to a Loki instance
What's Changed
New Contributors
Full Changelog: grafana/helm-charts@tempo-distributed-1.4.10...promtail-6.11.7
v6.11.6
Compare Source
Promtail is an agent which ships the contents of local logs to a Loki instance
What's Changed
New Contributors
Full Changelog: grafana/helm-charts@grafana-6.58.3...promtail-6.11.6
v6.11.5
Compare Source
Promtail is an agent which ships the contents of local logs to a Loki instance
What's Changed
New Contributors
Full Changelog: grafana/helm-charts@promtail-6.11.4...promtail-6.11.5
v6.11.4
Compare Source
Promtail is an agent which ships the contents of local logs to a Loki instance
What's Changed
Full Changelog: grafana/helm-charts@grafana-agent-0.16.0...promtail-6.11.4
v6.11.3
Compare Source
Promtail is an agent which ships the contents of local logs to a Loki instance
v6.11.2
Compare Source
Promtail is an agent which ships the contents of local logs to a Loki instance
v6.11.1
Compare Source
Promtail is an agent which ships the contents of local logs to a Loki instance
v6.11.0
Compare Source
Promtail is an agent which ships the contents of local logs to a Loki instance
v6.10.1
Compare Source
Promtail is an agent which ships the contents of local logs to a Loki instance
v6.10.0
Compare Source
Helm chart for Grafana Loki and Grafana Enterprise Logs supporting both simple, scalable and distributed modes.
Source commit: grafana/loki@9315b3d
Tag on source: https://github.com/grafana/loki/releases/tag/helm-loki-6.10.0
v6.9.3
Compare Source
Promtail is an agent which ships the contents of local logs to a Loki instance
v6.9.2
Compare Source
Promtail is an agent which ships the contents of local logs to a Loki instance
v6.9.1
Compare Source
The leading tool for querying and visualizing time series and metrics.
v6.9.0
Compare Source
Helm chart for Grafana Loki and Grafana Enterprise Logs supporting both simple, scalable and distributed modes.
Source commit: grafana/loki@1bf9791
Tag on source: https://github.com/grafana/loki/releases/tag/helm-loki-6.9.0
v6.8.3
Compare Source
Promtail is an agent which ships the contents of local logs to a Loki instance
v6.8.2
Compare Source
The leading tool for querying and visualizing time series and metrics.
v6.8.1
Compare Source
The leading tool for querying and visualizing time series and metrics.
v6.8.0
Compare Source
Helm chart for Grafana Loki and Grafana Enterprise Logs supporting both simple, scalable and distributed modes.
Source commit: grafana/loki@3be5a45
Tag on source: https://github.com/grafana/loki/releases/tag/helm-loki-6.8.0
v6.7.4
Compare Source
Helm chart for Grafana Loki and Grafana Enterprise Logs supporting both simple, scalable and distributed modes.
Source commit: grafana/loki@bdfc86b
Tag on source: https://github.com/grafana/loki/releases/tag/helm-loki-6.7.4
v6.7.3
Compare Source
Helm chart for Grafana Loki and Grafana Enterprise Logs supporting both simple, scalable and distributed modes.
Source commit: grafana/loki@ef03476
Tag on source: https://github.com/grafana/loki/releases/tag/helm-loki-6.7.3
v6.7.2
Compare Source
Helm chart for Grafana Loki and Grafana Enterprise Logs supporting both simple, scalable and distributed modes.
Source commit: grafana/loki@8434b2f
Tag on source: https://github.com/grafana/loki/releases/tag/helm-loki-6.7.2
v6.7.1
Compare Source
Helm chart for Grafana Loki and Grafana Enterprise Logs supporting both simple, scalable and distributed modes.
Source commit: grafana/loki@b5b861c
Tag on source: https://github.com/grafana/loki/releases/tag/helm-loki-6.7.1
v6.7.0
Compare Source
Helm chart for Grafana Loki and Grafana Enterprise Logs supporting both simple, scalable and distributed modes.
Source commit: grafana/loki@fc3904e
Tag on source: https://github.com/grafana/loki/releases/tag/helm-loki-6.7.0
v6.6.3
Compare Source
Helm chart for Grafana Loki and Grafana Enterprise Logs supporting both simple, scalable and distributed modes.
Source commit: grafana/loki@9823f20
Tag on source: https://github.com/grafana/loki/releases/tag/helm-loki-6.6.3
v6.6.2
Compare Source
Helm chart for Grafana Loki and Grafana Enterprise Logs supporting both simple, scalable and distributed modes.
Source commit: grafana/loki@1ab9d27
Tag on source: https://github.com/grafana/loki/releases/tag/helm-loki-6.6.2
v6.6.1
Compare Source
Helm chart for Grafana Loki and Grafana Enterprise Logs supporting both simple, scalable and distributed modes.
Source commit: grafana/loki@8101e21
Tag on source: https://github.com/grafana/loki/releases/tag/helm-loki-6.6.1
v6.6.0
Compare Source
Helm chart for Grafana Loki and Grafana Enterprise Logs supporting both simple, scalable and distributed modes.
Source commit: grafana/loki@efdae3d
Tag on source: https://github.com/grafana/loki/releases/tag/helm-loki-6.6.0
v6.5.1
Compare Source
Helm chart for Grafana Loki and Grafana Enterprise Logs supporting both simple, scalable and distributed modes.
Source commit: grafana/loki@67ed2f7
Tag on source: https://github.com/grafana/loki/releases/tag/helm-loki-6.5.1
Configuration
📅 Schedule: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined).
🚦 Automerge: Disabled by config. Please merge this manually once you are satisfied.
♻ Rebasing: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.
🔕 Ignore: Close this PR and you won't be reminded about these updates again.
This PR was generated by Mend Renovate. View the repository job log.