chore(deps): update helm release promtail to v6.6.1#820
Merged
Conversation
|
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: 'hostname'\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"
+ 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: 'hostname'\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"
---
# Source: promtail/templates/clusterrole.yaml
kind: ClusterRole
@@ -129,7 +129,7 @@
app.kubernetes.io/name: promtail
app.kubernetes.io/instance: promtail
annotations:
- checksum/config: 1a2e098a174495b90fb6dff2ddd42c8ec0ed21f85515c27e1f108a211b77c57e
+ checksum/config: c4a90a6dc679e0f6d36d42ea2d026fbf7af44aa9f5ca6d79de8efa6fb4a1bd1c
spec:
serviceAccountName: promtail
securityContext: |
8e6aeac to
0b1a01b
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: 'hostname'\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"
+ 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: 'hostname'\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"
---
# Source: promtail/templates/clusterrole.yaml
kind: ClusterRole
@@ -129,7 +129,7 @@
app.kubernetes.io/name: promtail
app.kubernetes.io/instance: promtail
annotations:
- checksum/config: 1a2e098a174495b90fb6dff2ddd42c8ec0ed21f85515c27e1f108a211b77c57e
+ checksum/config: a0a8ea44992eaf78fe8f67ed687eba4fd914a97296ada0a4443802a7de8ae1ed
spec:
serviceAccountName: promtail
securityContext: |
0b1a01b to
3e22730
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: 'hostname'\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"
+ 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: 'hostname'\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"
---
# Source: promtail/templates/clusterrole.yaml
kind: ClusterRole
@@ -129,7 +129,7 @@
app.kubernetes.io/name: promtail
app.kubernetes.io/instance: promtail
annotations:
- checksum/config: 1a2e098a174495b90fb6dff2ddd42c8ec0ed21f85515c27e1f108a211b77c57e
+ checksum/config: e7cd07107d38039e5d4ee3db44af3d3a6aa10dffca2092d791734a54c4df84e1
spec:
serviceAccountName: promtail
securityContext:
@@ -211,7 +211,6 @@
kind: ServiceMonitor
metadata:
name: promtail
- namespace: default
labels:
app.kubernetes.io/name: promtail
app.kubernetes.io/instance: promtail
@@ -223,3 +222,4 @@
app.kubernetes.io/instance: promtail
endpoints:
- port: http-metrics
+ scheme: http |
3e22730 to
8deed59
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: 'hostname'\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"
+ 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: 'hostname'\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"
---
# Source: promtail/templates/clusterrole.yaml
kind: ClusterRole
@@ -129,7 +129,7 @@
app.kubernetes.io/name: promtail
app.kubernetes.io/instance: promtail
annotations:
- checksum/config: 1a2e098a174495b90fb6dff2ddd42c8ec0ed21f85515c27e1f108a211b77c57e
+ checksum/config: e7cd07107d38039e5d4ee3db44af3d3a6aa10dffca2092d791734a54c4df84e1
spec:
serviceAccountName: promtail
securityContext:
@@ -211,7 +211,6 @@
kind: ServiceMonitor
metadata:
name: promtail
- namespace: default
labels:
app.kubernetes.io/name: promtail
app.kubernetes.io/instance: promtail
@@ -223,3 +222,4 @@
app.kubernetes.io/instance: promtail
endpoints:
- port: http-metrics
+ scheme: http |
8deed59 to
5321dc5
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: 'hostname'\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"
+ 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: 'hostname'\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"
---
# Source: promtail/templates/clusterrole.yaml
kind: ClusterRole
@@ -129,7 +129,7 @@
app.kubernetes.io/name: promtail
app.kubernetes.io/instance: promtail
annotations:
- checksum/config: 1a2e098a174495b90fb6dff2ddd42c8ec0ed21f85515c27e1f108a211b77c57e
+ checksum/config: b063d9f32078053624e7acc36bba9cdf609559a0dfa645c43c81b6c8249c7c37
spec:
serviceAccountName: promtail
securityContext:
@@ -176,7 +176,7 @@
readinessProbe:
failureThreshold: 5
httpGet:
- path: /ready
+ path: '/ready'
port: http-metrics
initialDelaySeconds: 10
periodSeconds: 10
@@ -211,7 +211,6 @@
kind: ServiceMonitor
metadata:
name: promtail
- namespace: default
labels:
app.kubernetes.io/name: promtail
app.kubernetes.io/instance: promtail
@@ -223,3 +222,4 @@
app.kubernetes.io/instance: promtail
endpoints:
- port: http-metrics
+ scheme: http |
1 task
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This PR contains the following updates:
6.4.0->6.6.1⚠ Dependency Lookup Warnings ⚠
Warnings were logged while processing this repo. Please check the Dependency Dashboard for more information.
Release Notes
grafana/helm-charts
v6.6.1: grafana-6.6.1Compare Source
The leading tool for querying and visualizing time series and metrics.
v6.6.0Compare Source
Promtail is an agent which ships the contents of local logs to a Loki instance
v6.5.1Compare Source
Promtail is an agent which ships the contents of local logs to a Loki instance
v6.5.0Compare Source
Promtail is an agent which ships the contents of local logs to a Loki instance
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 this update again.
This PR has been generated by Mend Renovate. View repository job log here.