diff --git a/charts/victoria-logs-single/README.md b/charts/victoria-logs-single/README.md index 19411322e..19a05edb3 100644 --- a/charts/victoria-logs-single/README.md +++ b/charts/victoria-logs-single/README.md @@ -130,43 +130,45 @@ Change the values according to the need of the environment in ``victoria-logs-si fluent-bit.config.filters - string - 
-|
-    [FILTER]
-        Name kubernetes
-        Match kube.*
-        Merge_Log On
-        Keep_Log On
-        K8S-Logging.Parser On
-        K8S-Logging.Exclude On
-    [FILTER]
-        Name                nest
-        Match               *
-        Wildcard            pod_name
-        Operation lift
-        Nested_under kubernetes
-        Add_prefix   kubernetes_
-
- - + tpl + 
+fluent-bit.config.filters: |
+  [FILTER]
+      Name kubernetes
+      Match kube.*
+      Merge_Log On
+      Keep_Log On
+      K8S-Logging.Parser On
+      K8S-Logging.Exclude On
+  [FILTER]
+      Name                nest
+      Match               *
+      Wildcard            pod_name
+      Operation lift
+      Nested_under kubernetes
+      Add_prefix   kubernetes_
+ 
+
+ + FluentBit configuration filters fluent-bit.config.outputs - string - 
-|
-    [OUTPUT]
-        Name http
-        Match kube.*
-        Host {{ include "victoria-logs.server.fullname" . }}
-        port 9428
-        compress gzip
-        uri /insert/jsonline?_stream_fields=stream,kubernetes_pod_name,kubernetes_container_name,kubernetes_namespace_name&_msg_field=log&_time_field=date
-        format json_lines
-        json_date_format iso8601
-        header AccountID 0
-        header ProjectID 0
+			tpl
+			
+fluent-bit.config.outputs: |
+  [OUTPUT]
+      Name http
+      Match kube.*
+      Host {{ include "victoria-logs.server.fullname" . }}
+      port 9428
+      compress gzip
+      uri /insert/jsonline?_stream_fields=stream,kubernetes_pod_name,kubernetes_container_name,kubernetes_namespace_name&_msg_field=log&_time_field=date
+      format json_lines
+      json_date_format iso8601
+      header AccountID 0
+      header ProjectID 0
+ 
 

 
 			Note that Host must be replaced to match your VictoriaLogs service name Default format points to VictoriaLogs service.
@@ -276,6 +278,24 @@ false
 			
 auto
 

+
+			
+		
+		
+			global.image.registry
+			string
+			
+""
+

+
+			
+		
+		
+			global.imagePullSecrets
+			list
+			
+[]
+

 
 			
 		
@@ -313,7 +333,7 @@ server
 false
- See `kubectl explain poddisruptionbudget.spec` for more. Ref: [https://kubernetes.io/docs/tasks/run-application/configure-pdb/](https://kubernetes.io/docs/tasks/run-application/configure-pdb/) + See kubectl explain poddisruptionbudget.spec for more. Details are here podDisruptionBudget.extraLabels @@ -351,6 +371,15 @@ true Container workdir + + server.emptyDir + object + 
+{}
+
+ + + server.enabled bool @@ -495,6 +524,15 @@ victorialogs + + server.imagePullSecrets + list + 
+[]
+
+ + Image pull secrets + server.ingress.annotations string @@ -565,7 +603,7 @@ Prefix {} - Pod's node selector. Ref: [https://kubernetes.io/docs/user-guide/node-selection/](https://kubernetes.io/docs/user-guide/node-selection/) + Pod's node selector. Details are here server.persistentVolume.accessModes @@ -574,7 +612,7 @@ Prefix - ReadWriteOnce - Array of access modes. Must match those of existing PV or dynamic provisioner. Ref: [http://kubernetes.io/docs/user-guide/persistent-volumes/](http://kubernetes.io/docs/user-guide/persistent-volumes/) + Array of access modes. Must match those of existing PV or dynamic provisioner. Details are here server.persistentVolume.annotations @@ -685,7 +723,7 @@ runAsNonRoot: true runAsUser: 1000 - Pod's security context. Ref: [https://kubernetes.io/docs/tasks/configure-pod-container/security-context/](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/) + Pod's security context. Details are here server.priorityClassName @@ -697,112 +735,34 @@ runAsUser: 1000 Name of Priority Class - server.probe.liveness.failureThreshold - int - 
-10
-
- - - - - server.probe.liveness.initialDelaySeconds - int - 
-30
-
- - - - - server.probe.liveness.periodSeconds - int - 
-30
-
- - - - - server.probe.liveness.tcpSocket.port - string - 
-'{{ include "vm.probe.port" . }}'
-
- - - - - server.probe.liveness.timeoutSeconds - int - 
-5
-
- - - - - server.probe.readiness.failureThreshold - int - 
-3
-
- - - - - server.probe.readiness.httpGet.path - string - 
-'{{ include "vm.probe.http.path" . }}'
-
- - - - - server.probe.readiness.httpGet.port - string - 
-'{{ include "vm.probe.port" . }}'
-
- - - - - server.probe.readiness.httpGet.scheme - string - 
-'{{ include "vm.probe.http.scheme" . }}'
-
- - - - - server.probe.readiness.initialDelaySeconds - int - 
-5
-
- - - - - server.probe.readiness.periodSeconds - int - 
-15
+			server.probe.liveness
+			object
+			
+failureThreshold: 10
+initialDelaySeconds: 30
+periodSeconds: 30
+tcpSocket:
+    port: '{{ include "vm.probe.port" . }}'
+timeoutSeconds: 5
 

 
-			
+			Indicates whether the Container is running. If the liveness probe fails, the kubelet kills the Container, and the Container is subjected to its restart policy. If a Container does not provide a liveness probe, the default state is Success.
 		
 		
-			server.probe.readiness.timeoutSeconds
-			int
-			
-5
+			server.probe.readiness
+			object
+			
+failureThreshold: 3
+httpGet:
+    path: '{{ include "vm.probe.http.path" . }}'
+    port: '{{ include "vm.probe.port" . }}'
+    scheme: '{{ include "vm.probe.http.scheme" . }}'
+initialDelaySeconds: 5
+periodSeconds: 15
+timeoutSeconds: 5
 

 
-			
+			Indicates whether the Container is ready to service requests. If the readiness probe fails, the endpoints controller removes the Pod's IP address from the endpoints of all Services that match the Pod. The default state of readiness before the initial delay is Failure. If a Container does not provide a readiness probe, the default state is Success.
 		
 		
 			server.probe.startup
@@ -811,7 +771,7 @@ runAsUser: 1000
 {}
 

 
-			
+			Indicates whether the Container is done with potentially costly initialization. If set it is executed first. If it fails Container is restarted. If it succeeds liveness and readiness probes takes over.
 		
 		
 			server.resources
@@ -820,7 +780,7 @@ runAsUser: 1000
 {}
- Resource object. Ref: [http://kubernetes.io/docs/user-guide/compute-resources/](http://kubernetes.io/docs/user-guide/compute-resources/ + Resource object. Details are here server.retentionPeriod @@ -870,7 +830,7 @@ readOnlyRootFilesystem: true [] - Service External IPs. Ref: [https://kubernetes.io/docs/user-guide/services/#external-ips]( https://kubernetes.io/docs/user-guide/services/#external-ips) + Service External IPs. Details are here server.service.labels @@ -1032,7 +992,8 @@ OrderedReady [] - Node tolerations for server scheduling to nodes with taints. Ref: [https://kubernetes.io/docs/concepts/configuration/assign-pod-node/](https://kubernetes.io/docs/concepts/configuration/assign-pod-node/) + Node tolerations for server scheduling to nodes with taints. Details are here + diff --git a/charts/victoria-logs-single/values.yaml b/charts/victoria-logs-single/values.yaml index aab288df7..54463cbbf 100644 --- a/charts/victoria-logs-single/values.yaml +++ b/charts/victoria-logs-single/values.yaml @@ -21,7 +21,7 @@ global: printNotes: true podDisruptionBudget: - # -- See `kubectl explain poddisruptionbudget.spec` for more. Ref: [https://kubernetes.io/docs/tasks/run-application/configure-pdb/](https://kubernetes.io/docs/tasks/run-application/configure-pdb/) + # -- See kubectl explain poddisruptionbudget.spec for more. Details are here enabled: false # minAvailable: 1 # maxUnavailable: 1 @@ -82,7 +82,7 @@ server: initContainers: [] - # -- Node tolerations for server scheduling to nodes with taints. Ref: [https://kubernetes.io/docs/concepts/configuration/assign-pod-node/](https://kubernetes.io/docs/concepts/configuration/assign-pod-node/) + # -- Node tolerations for server scheduling to nodes with taints. Details are here tolerations: [] # - key: "key" @@ -90,7 +90,7 @@ server: # value: "value" # effect: "NoSchedule|PreferNoSchedule" - # -- Pod's node selector. Ref: [https://kubernetes.io/docs/user-guide/node-selection/](https://kubernetes.io/docs/user-guide/node-selection/) + # -- Pod's node selector. Details are here nodeSelector: {} # -- Pod affinity @@ -118,7 +118,7 @@ server: # -- Create/use Persistent Volume Claim for server component. Empty dir if false enabled: false - # -- Array of access modes. Must match those of existing PV or dynamic provisioner. Ref: [http://kubernetes.io/docs/user-guide/persistent-volumes/](http://kubernetes.io/docs/user-guide/persistent-volumes/) + # -- Array of access modes. Must match those of existing PV or dynamic provisioner. Details are here accessModes: - ReadWriteOnce # -- Persistant volume annotations @@ -149,7 +149,7 @@ server: # -- Pod's management policy podManagementPolicy: OrderedReady - # -- Resource object. Ref: [http://kubernetes.io/docs/user-guide/compute-resources/](http://kubernetes.io/docs/user-guide/compute-resources/ + # -- Resource object. Details are here resources: {} # limits: @@ -160,7 +160,7 @@ server: # memory: 512Mi probe: - # Indicates whether the Container is ready to service requests. If the readiness probe fails, the endpoints controller removes the Pod's IP address from the endpoints of all Services that match the Pod. The default state of readiness before the initial delay is Failure. If a Container does not provide a readiness probe, the default state is Success. + # -- Indicates whether the Container is ready to service requests. If the readiness probe fails, the endpoints controller removes the Pod's IP address from the endpoints of all Services that match the Pod. The default state of readiness before the initial delay is Failure. If a Container does not provide a readiness probe, the default state is Success. readiness: httpGet: path: '{{ include "vm.probe.http.path" . }}' @@ -171,7 +171,7 @@ server: timeoutSeconds: 5 failureThreshold: 3 - # Indicates whether the Container is running. If the liveness probe fails, the kubelet kills the Container, and the Container is subjected to its restart policy. If a Container does not provide a liveness probe, the default state is Success. + # -- Indicates whether the Container is running. If the liveness probe fails, the kubelet kills the Container, and the Container is subjected to its restart policy. If a Container does not provide a liveness probe, the default state is Success. liveness: tcpSocket: port: '{{ include "vm.probe.port" . }}' @@ -180,7 +180,7 @@ server: timeoutSeconds: 5 failureThreshold: 10 - # Indicates whether the Container is done with potentially costly initialization. If set it is executed first. If it fails Container is restarted. If it succeeds liveness and readiness probes takes over. + # -- Indicates whether the Container is done with potentially costly initialization. If set it is executed first. If it fails Container is restarted. If it succeeds liveness and readiness probes takes over. startup: {} # tcpSocket: # port: http @@ -198,7 +198,7 @@ server: - ALL readOnlyRootFilesystem: true - # -- Pod's security context. Ref: [https://kubernetes.io/docs/tasks/configure-pod-container/security-context/](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/) + # -- Pod's security context. Details are here podSecurityContext: enabled: true fsGroup: 2000 @@ -240,7 +240,7 @@ server: labels: {} # -- Service ClusterIP clusterIP: "" - # -- Service External IPs. Ref: [https://kubernetes.io/docs/user-guide/services/#external-ips]( https://kubernetes.io/docs/user-guide/services/#external-ips) + # -- Service External IPs. Details are here externalIPs: [] # -- Service load balacner IP loadBalancerIP: "" @@ -321,6 +321,7 @@ fluent-bit: config: # -- Note that Host must be replaced to match your VictoriaLogs service name # Default format points to VictoriaLogs service. + # @notationType -- tpl outputs: | [OUTPUT] Name http @@ -333,6 +334,8 @@ fluent-bit: json_date_format iso8601 header AccountID 0 header ProjectID 0 + # -- FluentBit configuration filters + # @notationType -- tpl filters: | [FILTER] Name kubernetes diff --git a/charts/victoria-metrics-agent/README.md b/charts/victoria-metrics-agent/README.md index 119609100..90374e1e2 100644 --- a/charts/victoria-metrics-agent/README.md +++ b/charts/victoria-metrics-agent/README.md @@ -130,1597 +130,251 @@ Change the values according to the need of the environment in ``victoria-metrics - config.scrape_configs[0].job_name - string - 
-vmagent
-
- - - - - config.scrape_configs[0].static_configs[0].targets[0] - string - 
-localhost:8429
-
- - - - - config.scrape_configs[1].bearer_token_file - string - 
-/var/run/secrets/kubernetes.io/serviceaccount/token
-
- - - - - config.scrape_configs[1].job_name - string - 
-kubernetes-apiservers
-
- - - - - config.scrape_configs[1].kubernetes_sd_configs[0].role - string - 
-endpoints
-
- - - - - config.scrape_configs[1].relabel_configs[0].action - string - 
-keep
-
- - - - - config.scrape_configs[1].relabel_configs[0].regex - string - 
-default;kubernetes;https
-
- - - - - config.scrape_configs[1].relabel_configs[0].source_labels[0] - string - 
-__meta_kubernetes_namespace
-
- - - - - config.scrape_configs[1].relabel_configs[0].source_labels[1] - string - 
-__meta_kubernetes_service_name
-
- - - - - config.scrape_configs[1].relabel_configs[0].source_labels[2] - string - 
-__meta_kubernetes_endpoint_port_name
-
- - - - - config.scrape_configs[1].scheme - string - 
-https
-
- - - - - config.scrape_configs[1].tls_config.ca_file - string - 
-/var/run/secrets/kubernetes.io/serviceaccount/ca.crt
-
- - - - - config.scrape_configs[1].tls_config.insecure_skip_verify - bool - 
-true
-
- - - - - config.scrape_configs[2].bearer_token_file - string - 
-/var/run/secrets/kubernetes.io/serviceaccount/token
-
- - - - - config.scrape_configs[2].job_name - string - 
-kubernetes-nodes
-
- - - - - config.scrape_configs[2].kubernetes_sd_configs[0].role - string - 
-node
-
- - - - - config.scrape_configs[2].relabel_configs[0].action - string - 
-labelmap
-
- - - - - config.scrape_configs[2].relabel_configs[0].regex - string - 
-__meta_kubernetes_node_label_(.+)
-
- - - - - config.scrape_configs[2].relabel_configs[1].replacement - string - 
-kubernetes.default.svc:443
-
- - - - - config.scrape_configs[2].relabel_configs[1].target_label - string - 
-__address__
-
- - - - - config.scrape_configs[2].relabel_configs[2].regex - string - 
-(.+)
-
- - - - - config.scrape_configs[2].relabel_configs[2].replacement - string - 
-/api/v1/nodes/$1/proxy/metrics
-
- - - - - config.scrape_configs[2].relabel_configs[2].source_labels[0] - string - 
-__meta_kubernetes_node_name
-
- - - - - config.scrape_configs[2].relabel_configs[2].target_label - string - 
-__metrics_path__
-
- - - - - config.scrape_configs[2].scheme - string - 
-https
-
- - - - - config.scrape_configs[2].tls_config.ca_file - string - 
-/var/run/secrets/kubernetes.io/serviceaccount/ca.crt
-
- - - - - config.scrape_configs[2].tls_config.insecure_skip_verify - bool - 
-true
-
- - - - - config.scrape_configs[3].bearer_token_file - string - 
-/var/run/secrets/kubernetes.io/serviceaccount/token
-
- - - - - config.scrape_configs[3].honor_timestamps - bool - 
-false
-
- - - - - config.scrape_configs[3].job_name - string - 
-kubernetes-nodes-cadvisor
-
- - - - - config.scrape_configs[3].kubernetes_sd_configs[0].role - string - 
-node
-
- - - - - config.scrape_configs[3].relabel_configs[0].action - string - 
-labelmap
-
- - - - - config.scrape_configs[3].relabel_configs[0].regex - string - 
-__meta_kubernetes_node_label_(.+)
-
- - - - - config.scrape_configs[3].relabel_configs[1].replacement - string - 
-kubernetes.default.svc:443
-
- - - - - config.scrape_configs[3].relabel_configs[1].target_label - string - 
-__address__
-
- - - - - config.scrape_configs[3].relabel_configs[2].regex - string - 
-(.+)
-
- - - - - config.scrape_configs[3].relabel_configs[2].replacement - string - 
-/api/v1/nodes/$1/proxy/metrics/cadvisor
-
- - - - - config.scrape_configs[3].relabel_configs[2].source_labels[0] - string - 
-__meta_kubernetes_node_name
-
- - - - - config.scrape_configs[3].relabel_configs[2].target_label - string - 
-__metrics_path__
-
- - - - - config.scrape_configs[3].scheme - string - 
-https
-
- - - - - config.scrape_configs[3].tls_config.ca_file - string - 
-/var/run/secrets/kubernetes.io/serviceaccount/ca.crt
-
- - - - - config.scrape_configs[3].tls_config.insecure_skip_verify - bool - 
-true
-
- - - - - config.scrape_configs[4].job_name - string - 
-kubernetes-service-endpoints
-
- - - - - config.scrape_configs[4].kubernetes_sd_configs[0].role - string - 
-endpointslices
-
- - - - - config.scrape_configs[4].relabel_configs[0].action - string - 
-drop
-
- - - - - config.scrape_configs[4].relabel_configs[0].regex - bool - 
-true
-
- - - - - config.scrape_configs[4].relabel_configs[0].source_labels[0] - string - 
-__meta_kubernetes_pod_container_init
-
- - - - - config.scrape_configs[4].relabel_configs[10].source_labels[0] - string - 
-__meta_kubernetes_service_name
-
- - - - - config.scrape_configs[4].relabel_configs[10].target_label - string - 
-service
-
- - - - - config.scrape_configs[4].relabel_configs[11].replacement - string - 
-${1}
-
- - - - - config.scrape_configs[4].relabel_configs[11].source_labels[0] - string - 
-__meta_kubernetes_service_name
-
- - - - - config.scrape_configs[4].relabel_configs[11].target_label - string - 
-job
-
- - - - - config.scrape_configs[4].relabel_configs[12].action - string - 
-replace
-
- - - - - config.scrape_configs[4].relabel_configs[12].source_labels[0] - string - 
-__meta_kubernetes_pod_node_name
-
- - - - - config.scrape_configs[4].relabel_configs[12].target_label - string - 
-node
-
- - - - - config.scrape_configs[4].relabel_configs[1].action - string - 
-keep_if_equal
-
- - - - - config.scrape_configs[4].relabel_configs[1].source_labels[0] - string - 
-__meta_kubernetes_service_annotation_prometheus_io_port
-
- - - - - config.scrape_configs[4].relabel_configs[1].source_labels[1] - string - 
-__meta_kubernetes_pod_container_port_number
-
- - - - - config.scrape_configs[4].relabel_configs[2].action - string - 
-keep
-
- - - - - config.scrape_configs[4].relabel_configs[2].regex - bool - 
-true
-
- - - - - config.scrape_configs[4].relabel_configs[2].source_labels[0] - string - 
-__meta_kubernetes_service_annotation_prometheus_io_scrape
-
- - - - - config.scrape_configs[4].relabel_configs[3].action - string - 
-replace
-
- - - - - config.scrape_configs[4].relabel_configs[3].regex - string - 
-(https?)
-
- - - - - config.scrape_configs[4].relabel_configs[3].source_labels[0] - string - 
-__meta_kubernetes_service_annotation_prometheus_io_scheme
-
- - - - - config.scrape_configs[4].relabel_configs[3].target_label - string - 
-__scheme__
-
- - - - - config.scrape_configs[4].relabel_configs[4].action - string - 
-replace
-
- - - - - config.scrape_configs[4].relabel_configs[4].regex - string - 
-(.+)
-
- - - - - config.scrape_configs[4].relabel_configs[4].source_labels[0] - string - 
-__meta_kubernetes_service_annotation_prometheus_io_path
-
- - - - - config.scrape_configs[4].relabel_configs[4].target_label - string - 
-__metrics_path__
-
- - - - - config.scrape_configs[4].relabel_configs[5].action - string - 
-replace
-
- - - - - config.scrape_configs[4].relabel_configs[5].regex - string - 
-([^:]+)(?::\d+)?;(\d+)
-
- - - - - config.scrape_configs[4].relabel_configs[5].replacement - string - 
-$1:$2
-
- - - - - config.scrape_configs[4].relabel_configs[5].source_labels[0] - string - 
-__address__
-
- - - - - config.scrape_configs[4].relabel_configs[5].source_labels[1] - string - 
-__meta_kubernetes_service_annotation_prometheus_io_port
-
- - - - - config.scrape_configs[4].relabel_configs[5].target_label - string - 
-__address__
-
- - - - - config.scrape_configs[4].relabel_configs[6].action - string - 
-labelmap
-
- - - - - config.scrape_configs[4].relabel_configs[6].regex - string - 
-__meta_kubernetes_service_label_(.+)
-
- - - - - config.scrape_configs[4].relabel_configs[7].source_labels[0] - string - 
-__meta_kubernetes_pod_name
-
- - - - - config.scrape_configs[4].relabel_configs[7].target_label - string - 
-pod
-
- - - - - config.scrape_configs[4].relabel_configs[8].source_labels[0] - string - 
-__meta_kubernetes_pod_container_name
-
- - - - - config.scrape_configs[4].relabel_configs[8].target_label - string - 
-container
-
- - - - - config.scrape_configs[4].relabel_configs[9].source_labels[0] - string - 
-__meta_kubernetes_namespace
-
- - - - - config.scrape_configs[4].relabel_configs[9].target_label - string - 
-namespace
-
- - - - - config.scrape_configs[5].job_name - string - 
-kubernetes-service-endpoints-slow
-
- - - - - config.scrape_configs[5].kubernetes_sd_configs[0].role - string - 
-endpointslices
-
- - - - - config.scrape_configs[5].relabel_configs[0].action - string - 
-drop
-
- - - - - config.scrape_configs[5].relabel_configs[0].regex - bool - 
-true
-
- - - - - config.scrape_configs[5].relabel_configs[0].source_labels[0] - string - 
-__meta_kubernetes_pod_container_init
-
- - - - - config.scrape_configs[5].relabel_configs[10].source_labels[0] - string - 
-__meta_kubernetes_service_name
-
- - - - - config.scrape_configs[5].relabel_configs[10].target_label - string - 
-service
-
- - - - - config.scrape_configs[5].relabel_configs[11].replacement - string - 
-${1}
-
- - - - - config.scrape_configs[5].relabel_configs[11].source_labels[0] - string - 
-__meta_kubernetes_service_name
-
- - - - - config.scrape_configs[5].relabel_configs[11].target_label - string - 
-job
-
- - - - - config.scrape_configs[5].relabel_configs[12].action - string - 
-replace
-
- - - - - config.scrape_configs[5].relabel_configs[12].source_labels[0] - string - 
-__meta_kubernetes_pod_node_name
-
- - - - - config.scrape_configs[5].relabel_configs[12].target_label - string - 
-node
-
- - - - - config.scrape_configs[5].relabel_configs[1].action - string - 
-keep_if_equal
-
- - - - - config.scrape_configs[5].relabel_configs[1].source_labels[0] - string - 
-__meta_kubernetes_service_annotation_prometheus_io_port
-
- - - - - config.scrape_configs[5].relabel_configs[1].source_labels[1] - string - 
-__meta_kubernetes_pod_container_port_number
-
- - - - - config.scrape_configs[5].relabel_configs[2].action - string - 
-keep
-
- - - - - config.scrape_configs[5].relabel_configs[2].regex - bool - 
-true
-
- - - - - config.scrape_configs[5].relabel_configs[2].source_labels[0] - string - 
-__meta_kubernetes_service_annotation_prometheus_io_scrape_slow
-
- - - - - config.scrape_configs[5].relabel_configs[3].action - string - 
-replace
-
- - - - - config.scrape_configs[5].relabel_configs[3].regex - string - 
-(https?)
-
- - - - - config.scrape_configs[5].relabel_configs[3].source_labels[0] - string - 
-__meta_kubernetes_service_annotation_prometheus_io_scheme
-
- - - - - config.scrape_configs[5].relabel_configs[3].target_label - string - 
-__scheme__
-
- - - - - config.scrape_configs[5].relabel_configs[4].action - string - 
-replace
-
- - - - - config.scrape_configs[5].relabel_configs[4].regex - string - 
-(.+)
-
- - - - - config.scrape_configs[5].relabel_configs[4].source_labels[0] - string - 
-__meta_kubernetes_service_annotation_prometheus_io_path
-
- - - - - config.scrape_configs[5].relabel_configs[4].target_label - string - 
-__metrics_path__
-
- - - - - config.scrape_configs[5].relabel_configs[5].action - string - 
-replace
-
- - - - - config.scrape_configs[5].relabel_configs[5].regex - string - 
-([^:]+)(?::\d+)?;(\d+)
-
- - - - - config.scrape_configs[5].relabel_configs[5].replacement - string - 
-$1:$2
-
- - - - - config.scrape_configs[5].relabel_configs[5].source_labels[0] - string - 
-__address__
-
- - - - - config.scrape_configs[5].relabel_configs[5].source_labels[1] - string - 
-__meta_kubernetes_service_annotation_prometheus_io_port
-
- - - - - config.scrape_configs[5].relabel_configs[5].target_label - string - 
-__address__
-
- - - - - config.scrape_configs[5].relabel_configs[6].action - string - 
-labelmap
-
- - - - - config.scrape_configs[5].relabel_configs[6].regex - string - 
-__meta_kubernetes_service_label_(.+)
-
- - - - - config.scrape_configs[5].relabel_configs[7].source_labels[0] - string - 
-__meta_kubernetes_pod_name
-
- - - - - config.scrape_configs[5].relabel_configs[7].target_label - string - 
-pod
-
- - - - - config.scrape_configs[5].relabel_configs[8].source_labels[0] - string - 
-__meta_kubernetes_pod_container_name
-
- - - - - config.scrape_configs[5].relabel_configs[8].target_label - string - 
-container
-
- - - - - config.scrape_configs[5].relabel_configs[9].source_labels[0] - string - 
-__meta_kubernetes_namespace
-
- - - - - config.scrape_configs[5].relabel_configs[9].target_label - string - 
-namespace
-
- - - - - config.scrape_configs[5].scrape_interval - string - 
-5m
-
- - - - - config.scrape_configs[5].scrape_timeout - string - 
-30s
-
- - - - - config.scrape_configs[6].job_name - string - 
-kubernetes-services
-
- - - - - config.scrape_configs[6].kubernetes_sd_configs[0].role - string - 
-service
-
- - - - - config.scrape_configs[6].metrics_path - string - 
-/probe
-
- - - - - config.scrape_configs[6].params.module[0] - string - 
-http_2xx
-
- - - - - config.scrape_configs[6].relabel_configs[0].action - string - 
-keep
-
- - - - - config.scrape_configs[6].relabel_configs[0].regex - bool - 
-true
-
- - - - - config.scrape_configs[6].relabel_configs[0].source_labels[0] - string - 
-__meta_kubernetes_service_annotation_prometheus_io_probe
-
- - - - - config.scrape_configs[6].relabel_configs[1].source_labels[0] - string - 
-__address__
-
- - - - - config.scrape_configs[6].relabel_configs[1].target_label - string - 
-__param_target
-
- - - - - config.scrape_configs[6].relabel_configs[2].replacement - string - 
-blackbox
-
- - - - - config.scrape_configs[6].relabel_configs[2].target_label - string - 
-__address__
-
- - - - - config.scrape_configs[6].relabel_configs[3].source_labels[0] - string - 
-__param_target
-
- - - - - config.scrape_configs[6].relabel_configs[3].target_label - string - 
-instance
-
- - - - - config.scrape_configs[6].relabel_configs[4].action - string - 
-labelmap
-
- - - - - config.scrape_configs[6].relabel_configs[4].regex - string - 
-__meta_kubernetes_service_label_(.+)
-
- - - - - config.scrape_configs[6].relabel_configs[5].source_labels[0] - string - 
-__meta_kubernetes_namespace
-
- - - - - config.scrape_configs[6].relabel_configs[5].target_label - string - 
-namespace
-
- - - - - config.scrape_configs[6].relabel_configs[6].source_labels[0] - string - 
-__meta_kubernetes_service_name
-
- - - - - config.scrape_configs[6].relabel_configs[6].target_label - string - 
-service
-
- - - - - config.scrape_configs[7].job_name - string - 
-kubernetes-pods
-
- - - - - config.scrape_configs[7].kubernetes_sd_configs[0].role - string - 
-pod
-
- - - - - config.scrape_configs[7].relabel_configs[0].action - string - 
-drop
-
- - - - - config.scrape_configs[7].relabel_configs[0].regex - bool - 
-true
-
- - - - - config.scrape_configs[7].relabel_configs[0].source_labels[0] - string - 
-__meta_kubernetes_pod_container_init
-
- - - - - config.scrape_configs[7].relabel_configs[1].action - string - 
-keep_if_equal
-
- - - - - config.scrape_configs[7].relabel_configs[1].source_labels[0] - string - 
-__meta_kubernetes_pod_annotation_prometheus_io_port
-
- - - - - config.scrape_configs[7].relabel_configs[1].source_labels[1] - string - 
-__meta_kubernetes_pod_container_port_number
-
- - - - - config.scrape_configs[7].relabel_configs[2].action - string - 
-keep
-
- - - - - config.scrape_configs[7].relabel_configs[2].regex - bool - 
-true
-
- - - - - config.scrape_configs[7].relabel_configs[2].source_labels[0] - string - 
-__meta_kubernetes_pod_annotation_prometheus_io_scrape
-
- - - - - config.scrape_configs[7].relabel_configs[3].action - string - 
-replace
-
- - - - - config.scrape_configs[7].relabel_configs[3].regex - string - 
-(.+)
-
- - - - - config.scrape_configs[7].relabel_configs[3].source_labels[0] - string - 
-__meta_kubernetes_pod_annotation_prometheus_io_path
-
- - - - - config.scrape_configs[7].relabel_configs[3].target_label - string - 
-__metrics_path__
-
- - - - - config.scrape_configs[7].relabel_configs[4].action - string - 
-replace
-
- - - - - config.scrape_configs[7].relabel_configs[4].regex - string - 
-([^:]+)(?::\d+)?;(\d+)
-
- - - - - config.scrape_configs[7].relabel_configs[4].replacement - string - 
-$1:$2
-
- - - - - config.scrape_configs[7].relabel_configs[4].source_labels[0] - string - 
-__address__
-
- - - - - config.scrape_configs[7].relabel_configs[4].source_labels[1] - string - 
-__meta_kubernetes_pod_annotation_prometheus_io_port
-
- - - - - config.scrape_configs[7].relabel_configs[4].target_label - string - 
-__address__
-
- - - - - config.scrape_configs[7].relabel_configs[5].action - string - 
-labelmap
-
- - - - - config.scrape_configs[7].relabel_configs[5].regex - string - 
-__meta_kubernetes_pod_label_(.+)
-
- - - - - config.scrape_configs[7].relabel_configs[6].source_labels[0] - string - 
-__meta_kubernetes_pod_name
-
- - - - - config.scrape_configs[7].relabel_configs[6].target_label - string - 
-pod
-
- - - - - config.scrape_configs[7].relabel_configs[7].source_labels[0] - string - 
-__meta_kubernetes_pod_container_name
-
- - - - - config.scrape_configs[7].relabel_configs[7].target_label - string - 
-container
-
- - - - - config.scrape_configs[7].relabel_configs[8].source_labels[0] - string - 
-__meta_kubernetes_namespace
-
- - - - - config.scrape_configs[7].relabel_configs[8].target_label - string - 
-namespace
-
- - - - - config.scrape_configs[7].relabel_configs[9].action - string - 
-replace
-
- - - - - config.scrape_configs[7].relabel_configs[9].source_labels[0] - string - 
-__meta_kubernetes_pod_node_name
-
- - - - - config.scrape_configs[7].relabel_configs[9].target_label - string - 
-node
-
- - + config.scrape_configs + list + 
+- job_name: vmagent
+  static_configs:
+    - targets:
+        - localhost:8429
+- bearer_token_file: /var/run/secrets/kubernetes.io/serviceaccount/token
+  job_name: kubernetes-apiservers
+  kubernetes_sd_configs:
+    - role: endpoints
+  relabel_configs:
+    - action: keep
+      regex: default;kubernetes;https
+      source_labels:
+        - __meta_kubernetes_namespace
+        - __meta_kubernetes_service_name
+        - __meta_kubernetes_endpoint_port_name
+  scheme: https
+  tls_config:
+    ca_file: /var/run/secrets/kubernetes.io/serviceaccount/ca.crt
+    insecure_skip_verify: true
+- bearer_token_file: /var/run/secrets/kubernetes.io/serviceaccount/token
+  job_name: kubernetes-nodes
+  kubernetes_sd_configs:
+    - role: node
+  relabel_configs:
+    - action: labelmap
+      regex: __meta_kubernetes_node_label_(.+)
+    - replacement: kubernetes.default.svc:443
+      target_label: __address__
+    - regex: (.+)
+      replacement: /api/v1/nodes/$1/proxy/metrics
+      source_labels:
+        - __meta_kubernetes_node_name
+      target_label: __metrics_path__
+  scheme: https
+  tls_config:
+    ca_file: /var/run/secrets/kubernetes.io/serviceaccount/ca.crt
+    insecure_skip_verify: true
+- bearer_token_file: /var/run/secrets/kubernetes.io/serviceaccount/token
+  honor_timestamps: false
+  job_name: kubernetes-nodes-cadvisor
+  kubernetes_sd_configs:
+    - role: node
+  relabel_configs:
+    - action: labelmap
+      regex: __meta_kubernetes_node_label_(.+)
+    - replacement: kubernetes.default.svc:443
+      target_label: __address__
+    - regex: (.+)
+      replacement: /api/v1/nodes/$1/proxy/metrics/cadvisor
+      source_labels:
+        - __meta_kubernetes_node_name
+      target_label: __metrics_path__
+  scheme: https
+  tls_config:
+    ca_file: /var/run/secrets/kubernetes.io/serviceaccount/ca.crt
+    insecure_skip_verify: true
+- job_name: kubernetes-service-endpoints
+  kubernetes_sd_configs:
+    - role: endpointslices
+  relabel_configs:
+    - action: drop
+      regex: true
+      source_labels:
+        - __meta_kubernetes_pod_container_init
+    - action: keep_if_equal
+      source_labels:
+        - __meta_kubernetes_service_annotation_prometheus_io_port
+        - __meta_kubernetes_pod_container_port_number
+    - action: keep
+      regex: true
+      source_labels:
+        - __meta_kubernetes_service_annotation_prometheus_io_scrape
+    - action: replace
+      regex: (https?)
+      source_labels:
+        - __meta_kubernetes_service_annotation_prometheus_io_scheme
+      target_label: __scheme__
+    - action: replace
+      regex: (.+)
+      source_labels:
+        - __meta_kubernetes_service_annotation_prometheus_io_path
+      target_label: __metrics_path__
+    - action: replace
+      regex: ([^:]+)(?::\d+)?;(\d+)
+      replacement: $1:$2
+      source_labels:
+        - __address__
+        - __meta_kubernetes_service_annotation_prometheus_io_port
+      target_label: __address__
+    - action: labelmap
+      regex: __meta_kubernetes_service_label_(.+)
+    - source_labels:
+        - __meta_kubernetes_pod_name
+      target_label: pod
+    - source_labels:
+        - __meta_kubernetes_pod_container_name
+      target_label: container
+    - source_labels:
+        - __meta_kubernetes_namespace
+      target_label: namespace
+    - source_labels:
+        - __meta_kubernetes_service_name
+      target_label: service
+    - replacement: ${1}
+      source_labels:
+        - __meta_kubernetes_service_name
+      target_label: job
+    - action: replace
+      source_labels:
+        - __meta_kubernetes_pod_node_name
+      target_label: node
+- job_name: kubernetes-service-endpoints-slow
+  kubernetes_sd_configs:
+    - role: endpointslices
+  relabel_configs:
+    - action: drop
+      regex: true
+      source_labels:
+        - __meta_kubernetes_pod_container_init
+    - action: keep_if_equal
+      source_labels:
+        - __meta_kubernetes_service_annotation_prometheus_io_port
+        - __meta_kubernetes_pod_container_port_number
+    - action: keep
+      regex: true
+      source_labels:
+        - __meta_kubernetes_service_annotation_prometheus_io_scrape_slow
+    - action: replace
+      regex: (https?)
+      source_labels:
+        - __meta_kubernetes_service_annotation_prometheus_io_scheme
+      target_label: __scheme__
+    - action: replace
+      regex: (.+)
+      source_labels:
+        - __meta_kubernetes_service_annotation_prometheus_io_path
+      target_label: __metrics_path__
+    - action: replace
+      regex: ([^:]+)(?::\d+)?;(\d+)
+      replacement: $1:$2
+      source_labels:
+        - __address__
+        - __meta_kubernetes_service_annotation_prometheus_io_port
+      target_label: __address__
+    - action: labelmap
+      regex: __meta_kubernetes_service_label_(.+)
+    - source_labels:
+        - __meta_kubernetes_pod_name
+      target_label: pod
+    - source_labels:
+        - __meta_kubernetes_pod_container_name
+      target_label: container
+    - source_labels:
+        - __meta_kubernetes_namespace
+      target_label: namespace
+    - source_labels:
+        - __meta_kubernetes_service_name
+      target_label: service
+    - replacement: ${1}
+      source_labels:
+        - __meta_kubernetes_service_name
+      target_label: job
+    - action: replace
+      source_labels:
+        - __meta_kubernetes_pod_node_name
+      target_label: node
+  scrape_interval: 5m
+  scrape_timeout: 30s
+- job_name: kubernetes-services
+  kubernetes_sd_configs:
+    - role: service
+  metrics_path: /probe
+  params:
+    module:
+        - http_2xx
+  relabel_configs:
+    - action: keep
+      regex: true
+      source_labels:
+        - __meta_kubernetes_service_annotation_prometheus_io_probe
+    - source_labels:
+        - __address__
+      target_label: __param_target
+    - replacement: blackbox
+      target_label: __address__
+    - source_labels:
+        - __param_target
+      target_label: instance
+    - action: labelmap
+      regex: __meta_kubernetes_service_label_(.+)
+    - source_labels:
+        - __meta_kubernetes_namespace
+      target_label: namespace
+    - source_labels:
+        - __meta_kubernetes_service_name
+      target_label: service
+- job_name: kubernetes-pods
+  kubernetes_sd_configs:
+    - role: pod
+  relabel_configs:
+    - action: drop
+      regex: true
+      source_labels:
+        - __meta_kubernetes_pod_container_init
+    - action: keep_if_equal
+      source_labels:
+        - __meta_kubernetes_pod_annotation_prometheus_io_port
+        - __meta_kubernetes_pod_container_port_number
+    - action: keep
+      regex: true
+      source_labels:
+        - __meta_kubernetes_pod_annotation_prometheus_io_scrape
+    - action: replace
+      regex: (.+)
+      source_labels:
+        - __meta_kubernetes_pod_annotation_prometheus_io_path
+      target_label: __metrics_path__
+    - action: replace
+      regex: ([^:]+)(?::\d+)?;(\d+)
+      replacement: $1:$2
+      source_labels:
+        - __address__
+        - __meta_kubernetes_pod_annotation_prometheus_io_port
+      target_label: __address__
+    - action: labelmap
+      regex: __meta_kubernetes_pod_label_(.+)
+    - source_labels:
+        - __meta_kubernetes_pod_name
+      target_label: pod
+    - source_labels:
+        - __meta_kubernetes_pod_container_name
+      target_label: container
+    - source_labels:
+        - __meta_kubernetes_namespace
+      target_label: namespace
+    - action: replace
+      source_labels:
+        - __meta_kubernetes_pod_node_name
+      target_label: node
+
+ + scrape configuration. scrape self by default configMap @@ -1755,6 +409,15 @@ true 
 {}
+ + + + + emptyDir + object + 
+{}
+
@@ -1777,31 +440,15 @@ true - extraArgs."envflag.enable" - string - 
-"true"
-
- - - - - extraArgs."envflag.prefix" - string - 
-VM_
-
- - - - - extraArgs.loggerFormat - string - 
-json
+			extraArgs
+			object
+			
+envflag.enable: "true"
+envflag.prefix: VM_
+loggerFormat: json
 

 
-			
+			vmagent extra command line arguments
 		
 		
 			extraContainers
@@ -1846,7 +493,7 @@ json
 []
- Extra scrape configs that will be appended to `config` + Extra scrape configs that will be appended to config extraVolumeMounts @@ -1881,6 +528,24 @@ json 
 auto
+ + + + + global.image.registry + string + 
+""
+
+ + + + + global.imagePullSecrets + list + 
+[]
+
@@ -2243,85 +908,31 @@ true priority class to be assigned to the pod(s) - probe.liveness.initialDelaySeconds - int - 
-5
-
- - - - - probe.liveness.periodSeconds - int - 
-15
-
- - - - - probe.liveness.tcpSocket.port - string - 
-'{{ include "vm.probe.port" . }}'
-
- - - - - probe.liveness.timeoutSeconds - int - 
-5
-
- - - - - probe.readiness.httpGet.path - string - 
-'{{ include "vm.probe.http.path" . }}'
-
- - - - - probe.readiness.httpGet.port - string - 
-'{{ include "vm.probe.port" . }}'
-
- - - - - probe.readiness.httpGet.scheme - string - 
-'{{ include "vm.probe.http.scheme" . }}'
-
- - - - - probe.readiness.initialDelaySeconds - int - 
-5
+			probe.liveness
+			object
+			
+initialDelaySeconds: 5
+periodSeconds: 15
+tcpSocket:
+    port: '{{ include "vm.probe.port" . }}'
+timeoutSeconds: 5
 

 
-			
+			liveness probe
 		
 		
-			probe.readiness.periodSeconds
-			int
-			
-15
+			probe.readiness
+			object
+			
+httpGet:
+    path: '{{ include "vm.probe.http.path" . }}'
+    port: '{{ include "vm.probe.port" . }}'
+    scheme: '{{ include "vm.probe.http.scheme" . }}'
+initialDelaySeconds: 5
+periodSeconds: 15
 

 
-			
+			readiness probe
 		
 		
 			probe.startup
@@ -2330,7 +941,7 @@ true
 {}
 

 
-			
+			startup probe
 		
 		
 			rbac.annotations
@@ -2366,7 +977,7 @@ true
 false
- if true and `rbac.enabled`, will deploy a Role/Rolebinding instead of a ClusterRole/ClusterRoleBinding + if true and rbac.enabled, will deploy a Role/Rolebinding instead of a ClusterRole/ClusterRoleBinding remoteWriteUrls @@ -2621,4 +1232,5 @@ false - \ No newline at end of file + + diff --git a/charts/victoria-metrics-agent/values.yaml b/charts/victoria-metrics-agent/values.yaml index de57e8b51..934139b0e 100644 --- a/charts/victoria-metrics-agent/values.yaml +++ b/charts/victoria-metrics-agent/values.yaml @@ -21,7 +21,7 @@ deployment: # maxUnavailable: 25% # type: RollingUpdate -# ref: https://kubernetes.io/docs/concepts/workloads/controllers/statefulset/ +# ref: https://kubernetes.io/docs/concepts/workloads/controllers/statefulset/ statefulset: enabled: false # -- create cluster of vmagents. See https://docs.victoriametrics.com/vmagent.html#scraping-big-number-of-targets @@ -53,7 +53,7 @@ rbac: create: true annotations: {} extraLabels: {} - # -- if true and `rbac.enabled`, will deploy a Role/Rolebinding instead of a ClusterRole/ClusterRoleBinding + # -- if true and rbac.enabled, will deploy a Role/Rolebinding instead of a ClusterRole/ClusterRoleBinding namespaced: false serviceAccount: @@ -65,7 +65,7 @@ serviceAccount: # If not set and create is true, a name is generated using the fullname template name: -## See `kubectl explain poddisruptionbudget.spec` for more +## See kubectl explain poddisruptionbudget.spec for more ## ref: https://kubernetes.io/docs/tasks/run-application/configure-pdb/ podDisruptionBudget: enabled: false @@ -84,6 +84,7 @@ multiTenantUrls: [] # - http://vm-insert-az1:8480 # - http://vm-insert-az2:8480 +# -- vmagent extra command line arguments extraArgs: envflag.enable: "true" envflag.prefix: VM_ @@ -288,7 +289,7 @@ config: global: scrape_interval: 10s - # scrape self by default + # -- scrape configuration. scrape self by default scrape_configs: - job_name: vmagent static_configs: @@ -299,15 +300,15 @@ config: # Scrape config for API servers. # # Kubernetes exposes API servers as endpoints to the default/kubernetes - # service so this uses `endpoints` role and uses relabelling to only keep + # service so this uses endpoints role and uses relabelling to only keep # the endpoints associated with the default/kubernetes service using the - # default named port `https`. This works for single API server deployments as + # default named port https. This works for single API server deployments as # well as HA API server deployments. - job_name: "kubernetes-apiservers" kubernetes_sd_configs: - role: endpoints # Default to scraping over https. If required, just disable this or change to - # `http`. + # http. scheme: https # This TLS & bearer token file config is used to connect to the actual scrape # endpoints for cluster components. This is separate to discovery auth @@ -339,7 +340,7 @@ config: regex: default;kubernetes;https - job_name: "kubernetes-nodes" # Default to scraping over https. If required, just disable this or change to - # `http`. + # http. scheme: https # This TLS & bearer token file config is used to connect to the actual scrape # endpoints for cluster components. This is separate to discovery auth @@ -370,7 +371,7 @@ config: replacement: /api/v1/nodes/$1/proxy/metrics - job_name: "kubernetes-nodes-cadvisor" # Default to scraping over https. If required, just disable this or change to - # `http`. + # http. scheme: https # This TLS & bearer token file config is used to connect to the actual scrape # endpoints for cluster components. This is separate to discovery auth @@ -412,12 +413,14 @@ config: # The relabeling allows the actual service scrape endpoint to be configured # via the following annotations: # - # * `prometheus.io/scrape`: Only scrape services that have a value of `true` - # * `prometheus.io/scheme`: If the metrics endpoint is secured then you will need - # to set this to `https` & most likely set the `tls_config` of the scrape config. - # * `prometheus.io/path`: If the metrics path is not `/metrics` override this. - # * `prometheus.io/port`: If the metrics are exposed on a different port to the - # service then set this appropriately. + # - job_name: "kubernetes-service-endpoints" kubernetes_sd_configs: - role: endpointslices @@ -472,12 +475,14 @@ config: # The relabeling allows the actual service scrape endpoint to be configured # via the following annotations: # - # * `prometheus.io/scrape-slow`: Only scrape services that have a value of `true` - # * `prometheus.io/scheme`: If the metrics endpoint is secured then you will need - # to set this to `https` & most likely set the `tls_config` of the scrape config. - # * `prometheus.io/path`: If the metrics path is not `/metrics` override this. - # * `prometheus.io/port`: If the metrics are exposed on a different port to the - # service then set this appropriately. + # - job_name: "kubernetes-service-endpoints-slow" scrape_interval: 5m scrape_timeout: 30s @@ -533,7 +538,9 @@ config: # The relabeling allows the actual service scrape endpoint to be configured # via the following annotations: # - # * `prometheus.io/probe`: Only probe services that have a value of `true` + # - job_name: "kubernetes-services" metrics_path: /probe params: @@ -562,9 +569,11 @@ config: # The relabeling allows the actual pod scrape endpoint to be configured via the # following annotations: # - # * `prometheus.io/scrape`: Only scrape pods that have a value of `true` - # * `prometheus.io/path`: If the metrics path is not `/metrics` override this. - # * `prometheus.io/port`: Scrape the pod on the indicated port instead of the default of `9102`. + # - job_name: "kubernetes-pods" kubernetes_sd_configs: - role: pod @@ -600,10 +609,11 @@ config: target_label: node ## End of COPY -# -- Extra scrape configs that will be appended to `config` +# -- Extra scrape configs that will be appended to config extraScrapeConfigs: [] probe: + # -- readiness probe readiness: httpGet: path: '{{ include "vm.probe.http.path" . }}' @@ -611,12 +621,14 @@ probe: port: '{{ include "vm.probe.port" . }}' initialDelaySeconds: 5 periodSeconds: 15 + # -- liveness probe liveness: tcpSocket: port: '{{ include "vm.probe.port" . }}' initialDelaySeconds: 5 periodSeconds: 15 timeoutSeconds: 5 + # -- startup probe startup: {} # Add extra specs dynamically to this chart diff --git a/charts/victoria-metrics-alert/README.md b/charts/victoria-metrics-alert/README.md index fdc9cc55a..8b067277e 100644 --- a/charts/victoria-metrics-alert/README.md +++ b/charts/victoria-metrics-alert/README.md @@ -196,6 +196,15 @@ devnull 
 ""
+ + + + + alertmanager.emptyDir + object + 
+{}
+
@@ -263,31 +272,15 @@ false - alertmanager.image.registry - string - 
-""
-
- - - - - alertmanager.image.repository - string - 
-prom/alertmanager
-
- - - - - alertmanager.image.tag - string - 
-v0.25.0
+			alertmanager.image
+			object
+			
+registry: ""
+repository: prom/alertmanager
+tag: v0.25.0
 

 
-			
+			alertmanager image configuration
 		
 		
 			alertmanager.imagePullSecrets
@@ -377,7 +370,7 @@ Prefix
 - ReadWriteOnce
- Array of access modes. Must match those of existing PV or dynamic provisioner. Ref: [http://kubernetes.io/docs/user-guide/persistent-volumes/](http://kubernetes.io/docs/user-guide/persistent-volumes/) + Array of access modes. Must match those of existing PV or dynamic provisioner. Details are here alertmanager.persistentVolume.annotations @@ -479,58 +472,37 @@ false - alertmanager.probe.liveness.httpGet.path - string - 
-'{{ ternary "" .baseURLPrefix (empty .baseURLPrefix) }}/-/healthy'
-
- - - - - alertmanager.probe.liveness.httpGet.port - string - 
-web
-
- - - - - alertmanager.probe.readiness.httpGet.path - string - 
-'{{ ternary "" .baseURLPrefix (empty .baseURLPrefix) }}/-/ready'
-
- - - - - alertmanager.probe.readiness.httpGet.port - string - 
-web
+			alertmanager.probe.liveness
+			object
+			
+httpGet:
+    path: '{{ ternary "" .baseURLPrefix (empty .baseURLPrefix) }}/-/healthy'
+    port: web
 

 
-			
+			liveness probe
 		
 		
-			alertmanager.probe.startup.httpGet.path
-			string
-			
-'{{ ternary "" .baseURLPrefix (empty .baseURLPrefix) }}/-/ready'
+			alertmanager.probe.readiness
+			object
+			
+httpGet:
+    path: '{{ ternary "" .baseURLPrefix (empty .baseURLPrefix) }}/-/ready'
+    port: web
 

 
-			
+			readiness probe
 		
 		
-			alertmanager.probe.startup.httpGet.port
-			string
-			
-web
+			alertmanager.probe.startup
+			object
+			
+httpGet:
+    path: '{{ ternary "" .baseURLPrefix (empty .baseURLPrefix) }}/-/ready'
+    port: web
 

 
-			
+			startup probe
 		
 		
 			alertmanager.resources
@@ -619,6 +591,24 @@ ClusterIP
 			
 auto
 

+
+			
+		
+		
+			global.image.registry
+			string
+			
+""
+

+
+			
+		
+		
+			global.imagePullSecrets
+			list
+			
+[]
+

 
 			
 		
@@ -880,49 +870,17 @@ json
 			
 		
 		
-			server.image.pullPolicy
-			string
-			
-IfNotPresent
-

-
-			
-		
-		
-			server.image.registry
-			string
-			
-""
-

-
-			
-		
-		
-			server.image.repository
-			string
-			
-victoriametrics/vmalert
-

-
-			
-		
-		
-			server.image.tag
-			string
-			
-""
-

-
-			
-		
-		
-			server.image.variant
-			string
-			
-""
+			server.image
+			object
+			
+pullPolicy: IfNotPresent
+registry: ""
+repository: victoriametrics/vmalert
+tag: ""
+variant: ""
 

 
-			
+			vmalert image configuration
 		
 		
 			server.imagePullSecrets
@@ -1046,7 +1004,7 @@ alertmanager:
     url: ""
 

 
-			Notifier to use for alerts. Multiple notifiers can be enabled by using `notifiers` section
+			Notifier to use for alerts. Multiple notifiers can be enabled by using notifiers section
 		
 		
 			server.notifier.alertmanager.basicAuth
@@ -1140,112 +1098,34 @@ true
 			
 		
 		
-			server.probe.liveness.failureThreshold
-			int
-			
-3
-

-
-			
-		
-		
-			server.probe.liveness.initialDelaySeconds
-			int
-			
-5
-

-
-			
-		
-		
-			server.probe.liveness.periodSeconds
-			int
-			
-15
-

-
-			
-		
-		
-			server.probe.liveness.tcpSocket.port
-			string
-			
-'{{ include "vm.probe.port" . }}'
-

-
-			
-		
-		
-			server.probe.liveness.timeoutSeconds
-			int
-			
-5
-

-
-			
-		
-		
-			server.probe.readiness.failureThreshold
-			int
-			
-3
-

-
-			
-		
-		
-			server.probe.readiness.httpGet.path
-			string
-			
-'{{ include "vm.probe.http.path" . }}'
-

-
-			
-		
-		
-			server.probe.readiness.httpGet.port
-			string
-			
-'{{ include "vm.probe.port" . }}'
-

-
-			
-		
-		
-			server.probe.readiness.httpGet.scheme
-			string
-			
-'{{ include "vm.probe.http.scheme" . }}'
-

-
-			
-		
-		
-			server.probe.readiness.initialDelaySeconds
-			int
-			
-5
-

-
-			
-		
-		
-			server.probe.readiness.periodSeconds
-			int
-			
-15
+			server.probe.liveness
+			object
+			
+failureThreshold: 3
+initialDelaySeconds: 5
+periodSeconds: 15
+tcpSocket:
+    port: '{{ include "vm.probe.port" . }}'
+timeoutSeconds: 5
 

 
-			
+			liveness probe
 		
 		
-			server.probe.readiness.timeoutSeconds
-			int
-			
-5
+			server.probe.readiness
+			object
+			
+failureThreshold: 3
+httpGet:
+    path: '{{ include "vm.probe.http.path" . }}'
+    port: '{{ include "vm.probe.port" . }}'
+    scheme: '{{ include "vm.probe.http.scheme" . }}'
+initialDelaySeconds: 5
+periodSeconds: 15
+timeoutSeconds: 5
 

 
-			
+			readiness probe
 		
 		
 			server.probe.startup
@@ -1254,7 +1134,7 @@ true
 {}
 

 
-			
+			startup probe
 		
 		
 			server.remote.read.basicAuth
@@ -1585,3 +1465,4 @@ false
 		
 	
 
+
diff --git a/charts/victoria-metrics-alert/values.yaml b/charts/victoria-metrics-alert/values.yaml
index e1198cdd5..4ea938013 100644
--- a/charts/victoria-metrics-alert/values.yaml
+++ b/charts/victoria-metrics-alert/values.yaml
@@ -29,6 +29,7 @@ rbac:
 server:
   name: server
   enabled: true
+  # -- vmalert image configuration
   image:
     registry: ""
     repository: victoriametrics/vmalert
@@ -41,8 +42,7 @@ server:
   fullnameOverride: ""
   imagePullSecrets: []
 
-  ## See `kubectl explain poddisruptionbudget.spec` for more
-  ## ref: https://kubernetes.io/docs/tasks/run-application/configure-pdb/
+  ## -- See kubectl explain poddisruptionbudget.spec for more. Or check docs
   podDisruptionBudget:
     enabled: false
     # minAvailable: 1
@@ -63,8 +63,8 @@ server:
     #- configMapRef:
     #    name: special-config
 
-  # Readiness & Liveness probes
   probe:
+    # -- readiness probe
     readiness:
       httpGet:
         path: '{{ include "vm.probe.http.path" . }}'
@@ -74,6 +74,7 @@ server:
       periodSeconds: 15
       timeoutSeconds: 5
       failureThreshold: 3
+    # -- liveness probe
     liveness:
       tcpSocket:
         port: '{{ include "vm.probe.port" . }}'
@@ -81,6 +82,7 @@ server:
       periodSeconds: 15
       timeoutSeconds: 5
       failureThreshold: 3
+    # -- startup probe
     startup: {}
 
   replicaCount: 1
@@ -138,7 +140,7 @@ server:
         tokenFile: ""
 
   # -- Notifier to use for alerts.
-  # Multiple notifiers can be enabled by using `notifiers` section
+  # Multiple notifiers can be enabled by using notifiers section
   notifier:
     alertmanager:
       url: ""
@@ -335,6 +337,7 @@ alertmanager:
   podMetadata:
     labels: {}
     annotations: {}
+  # -- alertmanager image configuration
   image:
     registry: ""
     repository: prom/alertmanager
@@ -346,14 +349,17 @@ alertmanager:
   tolerations: []
   imagePullSecrets: []
   probe:
+    # -- readiness probe
     readiness:
       httpGet:
         path: '{{ ternary "" .baseURLPrefix (empty .baseURLPrefix) }}/-/ready'
         port: web
+    # -- liveness probe
     liveness:
       httpGet:
         path: '{{ ternary "" .baseURLPrefix (empty .baseURLPrefix) }}/-/healthy'
         port: web
+    # -- startup probe
     startup:
       httpGet:
         path: '{{ ternary "" .baseURLPrefix (empty .baseURLPrefix) }}/-/ready'
@@ -422,7 +428,7 @@ alertmanager:
   persistentVolume:
     # -- Create/use Persistent Volume Claim for alertmanager component. Empty dir if false
     enabled: false
-    # -- Array of access modes. Must match those of existing PV or dynamic provisioner. Ref: [http://kubernetes.io/docs/user-guide/persistent-volumes/](http://kubernetes.io/docs/user-guide/persistent-volumes/)
+    # -- Array of access modes. Must match those of existing PV or dynamic provisioner. Details are here
     accessModes:
       - ReadWriteOnce
     # -- Persistant volume annotations
diff --git a/charts/victoria-metrics-anomaly/README.md b/charts/victoria-metrics-anomaly/README.md
index 4f46fce99..e628591b0 100644
--- a/charts/victoria-metrics-anomaly/README.md
+++ b/charts/victoria-metrics-anomaly/README.md
@@ -152,7 +152,7 @@ writer:
     tenant_id: ""
 

 
-			Full [vmanomaly config section](https://docs.victoriametrics.com/anomaly-detection/components/)
+			Full vmanomaly config section
 		
 		
 			config.models
@@ -161,7 +161,7 @@ writer:
 {}
 

 
-			[Models section](https://docs.victoriametrics.com/anomaly-detection/components/models/)
+			Models section
 		
 		
 			config.preset
@@ -183,7 +183,7 @@ sampling_period: 1m
 tenant_id: ""
 

 
-			[Reader section](https://docs.victoriametrics.com/anomaly-detection/components/reader/)
+			Reader section
 		
 		
 			config.reader.class
@@ -201,7 +201,7 @@ vm
 ""
- Datasource URL address. Required for example "http://single-victoria-metrics-single-server.default.svc.cluster.local:8428" or "http://cluster-victoria-metrics-cluster-vminsert.default.svc.cluster.local:8480/insert/" + Datasource URL address. Required for example http://single-victoria-metrics-single-server.default.svc.cluster.local:8428 or http://cluster-victoria-metrics-cluster-vminsert.default.svc.cluster.local:8480/insert/ config.reader.queries @@ -219,7 +219,7 @@ vm 1m - Frequency of the points returned. Will be converted to "/query_range?step=%s" param (in seconds). **Required** since 1.9.0. + Frequency of the points returned. Will be converted to /query_range?step=%s param (in seconds). Required since 1.9.0. config.reader.tenant_id @@ -237,7 +237,7 @@ vm {} - [Scheduler section](https://docs.victoriametrics.com/anomaly-detection/components/scheduler/) + Scheduler section config.writer @@ -248,7 +248,7 @@ datasource_url: "" tenant_id: "" - [Writer section](https://docs.victoriametrics.com/anomaly-detection/components/writer/) + Writer section config.writer.class @@ -266,7 +266,7 @@ vm "" - Datasource URL address. Required for example "http://single-victoria-metrics-single-server.default.svc.cluster.local:8428" or "http://cluster-victoria-metrics-cluster-vminsert.default.svc.cluster.local:8480/insert/" + Datasource URL address. Required for example http://single-victoria-metrics-single-server.default.svc.cluster.local:8428 or http://cluster-victoria-metrics-cluster-vminsert.default.svc.cluster.local:8480/insert/ config.writer.tenant_id @@ -373,6 +373,24 @@ json 
 auto
+ + + + + global.image.registry + string + 
+""
+
+ + + + + global.imagePullSecrets + list + 
+[]
+
@@ -431,7 +449,7 @@ secret: name: "" - License key configuration for vmanomaly. See [docs](https://docs.victoriametrics.com/vmanomaly.html#licensing) Required starting from v1.5.0. + License key configuration for vmanomaly. See docs Required starting from v1.5.0. license.key @@ -486,7 +504,7 @@ name: "" {} - NodeSelector configurations. Ref: https://kubernetes.io/docs/user-guide/node-selection/ + NodeSelector configurations. Details are here persistentVolume @@ -511,7 +529,7 @@ storageClass: "" - ReadWriteOnce - Array of access modes. Must match those of existing PV or dynamic provisioner. Ref: [http://kubernetes.io/docs/user-guide/persistent-volumes/](http://kubernetes.io/docs/user-guide/persistent-volumes/) + Array of access modes. Must match those of existing PV or dynamic provisioner. Details are here persistentVolume.annotations @@ -584,7 +602,7 @@ enabled: false labels: {} - See `kubectl explain poddisruptionbudget.spec` for more. Ref: https://kubernetes.io/docs/tasks/run-application/configure-pdb/ + See kubectl explain poddisruptionbudget.spec for more. Details are here podSecurityContext.enabled @@ -701,7 +719,8 @@ false [] - Tolerations configurations. Ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/ + Tolerations configurations. Details are here + diff --git a/charts/victoria-metrics-anomaly/values.yaml b/charts/victoria-metrics-anomaly/values.yaml index bd83d44d0..2c9d6209f 100644 --- a/charts/victoria-metrics-anomaly/values.yaml +++ b/charts/victoria-metrics-anomaly/values.yaml @@ -33,7 +33,7 @@ serviceAccount: # The name of the service account to use. If not set and create is true, a name is generated using the fullname template name: -# -- See `kubectl explain poddisruptionbudget.spec` for more. Ref: https://kubernetes.io/docs/tasks/run-application/configure-pdb/ +# -- See kubectl explain poddisruptionbudget.spec for more. Details are here podDisruptionBudget: enabled: false # minAvailable: 1 @@ -102,10 +102,10 @@ annotations: {} # -- Annotations to be added to pod podAnnotations: {} -# -- NodeSelector configurations. Ref: https://kubernetes.io/docs/user-guide/node-selection/ +# -- NodeSelector configurations. Details are here nodeSelector: {} -# -- Tolerations configurations. Ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/ +# -- Tolerations configurations. Details are here tolerations: [] # - key: "key" # operator: "Equal|Exists" @@ -125,21 +125,21 @@ serviceMonitor: # https://victoriametrics.com/legal/esa/ eula: false -# -- Full [vmanomaly config section](https://docs.victoriametrics.com/anomaly-detection/components/) +# -- Full vmanomaly config section config: # -- Whether to use preset configuration. If not empty, preset name should be specified. preset: "" - # -- [Scheduler section](https://docs.victoriametrics.com/anomaly-detection/components/scheduler/) + # -- Scheduler section schedulers: {} - # -- [Models section](https://docs.victoriametrics.com/anomaly-detection/components/models/) + # -- Models section models: {} - # -- [Reader section](https://docs.victoriametrics.com/anomaly-detection/components/reader/) + # -- Reader section reader: # -- Name of the class needed to enable reading from VictoriaMetrics or Prometheus. VmReader is the default option, if not specified. class: "vm" - # -- Datasource URL address. Required for example "http://single-victoria-metrics-single-server.default.svc.cluster.local:8428" or "http://cluster-victoria-metrics-cluster-vminsert.default.svc.cluster.local:8480/insert/" + # -- Datasource URL address. Required for example http://single-victoria-metrics-single-server.default.svc.cluster.local:8428 or http://cluster-victoria-metrics-cluster-vminsert.default.svc.cluster.local:8480/insert/ datasource_url: "" # -- For VictoriaMetrics Cluster version only, tenants are identified by accountID or accountID:projectID. See VictoriaMetrics Cluster multitenancy docs tenant_id: "" @@ -156,14 +156,14 @@ config: # expr: 'sum(rate(vm_http_requests_total{path=~"/api/v1/write|.*insert.*"}[5m])) by (path) > 0' # slow_inserts: # expr: 'sum(rate(vm_slow_row_inserts_total[5m])) / sum(rate(vm_rows_inserted_total[5m]))' - # -- Frequency of the points returned. Will be converted to "/query_range?step=%s" param (in seconds). **Required** since 1.9.0. + # -- Frequency of the points returned. Will be converted to /query_range?step=%s param (in seconds). Required since 1.9.0. sampling_period: '1m' - # -- [Writer section](https://docs.victoriametrics.com/anomaly-detection/components/writer/) + # -- Writer section writer: # -- Name of the class needed to enable writing to VictoriaMetrics or Prometheus. VmWriter is the default option, if not specified. class: "vm" - # -- Datasource URL address. Required for example "http://single-victoria-metrics-single-server.default.svc.cluster.local:8428" or "http://cluster-victoria-metrics-cluster-vminsert.default.svc.cluster.local:8480/insert/" + # -- Datasource URL address. Required for example http://single-victoria-metrics-single-server.default.svc.cluster.local:8428 or http://cluster-victoria-metrics-cluster-vminsert.default.svc.cluster.local:8480/insert/ datasource_url: "" # -- For VictoriaMetrics Cluster version only, tenants are identified by accountID or accountID:projectID. See VictoriaMetrics Cluster multitenancy docs tenant_id: "" @@ -174,7 +174,7 @@ persistentVolume: # -- Create/use Persistent Volume Claim for models dump. enabled: false - # -- Array of access modes. Must match those of existing PV or dynamic provisioner. Ref: [http://kubernetes.io/docs/user-guide/persistent-volumes/](http://kubernetes.io/docs/user-guide/persistent-volumes/) + # -- Array of access modes. Must match those of existing PV or dynamic provisioner. Details are here accessModes: - ReadWriteOnce # -- Persistant volume annotations @@ -192,7 +192,7 @@ persistentVolume: # -- Size of the volume. Should be calculated based on the metrics you send and retention policy you set. size: 1Gi -# -- License key configuration for vmanomaly. See [docs](https://docs.victoriametrics.com/vmanomaly.html#licensing) +# -- License key configuration for vmanomaly. See docs # Required starting from v1.5.0. license: # -- License key for vmanomaly diff --git a/charts/victoria-metrics-auth/README.md b/charts/victoria-metrics-auth/README.md index f21f6dab4..8126f635b 100644 --- a/charts/victoria-metrics-auth/README.md +++ b/charts/victoria-metrics-auth/README.md @@ -252,6 +252,24 @@ json 
 auto
+ + + + + global.image.registry + string + 
+""
+
+ + + + + global.imagePullSecrets + list + 
+[]
+
@@ -501,7 +519,7 @@ enabled: false labels: {} - See `kubectl explain poddisruptionbudget.spec` for more. Ref: https://kubernetes.io/docs/tasks/run-application/configure-pdb/ + See kubectl explain poddisruptionbudget.spec for more. Ref: https://kubernetes.io/docs/tasks/run-application/configure-pdb/ podSecurityContext.enabled @@ -513,67 +531,29 @@ true - probe.liveness.initialDelaySeconds - int - 
-5
-
- - - - - probe.liveness.periodSeconds - int - 
-15
-
- - - - - probe.liveness.tcpSocket.port - string - 
-'{{ include "vm.probe.port" . }}'
-
- - - - - probe.liveness.timeoutSeconds - int - 
-5
-
- - - - - probe.readiness.initialDelaySeconds - int - 
-5
-
- - - - - probe.readiness.periodSeconds - int - 
-15
+			probe.liveness
+			object
+			
+initialDelaySeconds: 5
+periodSeconds: 15
+tcpSocket:
+    port: '{{ include "vm.probe.port" . }}'
+timeoutSeconds: 5
 

 
-			
+			liveness probe
 		
 		
-			probe.readiness.tcpSocket.port
-			string
-			
-'{{ include "vm.probe.port" . }}'
+			probe.readiness
+			object
+			
+initialDelaySeconds: 5
+periodSeconds: 15
+tcpSocket:
+    port: '{{ include "vm.probe.port" . }}'
 

 
-			
+			readiness probe
 		
 		
 			probe.startup
@@ -582,7 +562,7 @@ true
 {}
 

 
-			
+			startup probe
 		
 		
 			rbac.annotations
@@ -618,7 +598,7 @@ true
 {}
- We usually recommend not to specify default resources and to leave this as a conscious choice for the user. This also increases chances charts run on environments with little resources, such as Minikube. If you do want to specify resources, uncomment the following lines, adjust them as necessary, and remove the curly braces after 'resources:'. + We usually recommend not to specify default resources and to leave this as a conscious choice for the user. This also increases chances charts run on environments with little resources, such as Minikube. If you do want to specify resources, uncomment the following lines, adjust them as necessary, and remove the curly braces after resources:. secretName @@ -627,7 +607,7 @@ true "" - Use existing secret if specified otherwise .config values will be used. Ref: https://victoriametrics.github.io/vmauth.html. Configuration in the given secret must be stored under `auth.yml` key. + Use existing secret if specified otherwise .config values will be used. Ref: https://victoriametrics.github.io/vmauth.html. Configuration in the given secret must be stored under auth.yml key. securityContext.enabled @@ -811,3 +791,4 @@ false + diff --git a/charts/victoria-metrics-auth/values.yaml b/charts/victoria-metrics-auth/values.yaml index e2bbf77ab..5ce8b61ab 100644 --- a/charts/victoria-metrics-auth/values.yaml +++ b/charts/victoria-metrics-auth/values.yaml @@ -43,7 +43,7 @@ serviceAccount: # -- The name of the service account to use. If not set and create is true, a name is generated using the fullname template name: -# -- See `kubectl explain poddisruptionbudget.spec` for more. Ref: https://kubernetes.io/docs/tasks/run-application/configure-pdb/ +# -- See kubectl explain poddisruptionbudget.spec for more. Ref: https://kubernetes.io/docs/tasks/run-application/configure-pdb/ podDisruptionBudget: enabled: false # minAvailable: 1 @@ -159,7 +159,7 @@ ingressInternal: # -- pathType is only for k8s >= 1.1= pathType: Prefix -# -- We usually recommend not to specify default resources and to leave this as a conscious choice for the user. This also increases chances charts run on environments with little resources, such as Minikube. If you do want to specify resources, uncomment the following lines, adjust them as necessary, and remove the curly braces after 'resources:'. +# -- We usually recommend not to specify default resources and to leave this as a conscious choice for the user. This also increases chances charts run on environments with little resources, such as Minikube. If you do want to specify resources, uncomment the following lines, adjust them as necessary, and remove the curly braces after resources:. resources: {} # limits: # cpu: 100m @@ -212,7 +212,7 @@ serviceMonitor: # insecureSkipVerify: true # -- Use existing secret if specified otherwise .config values will be used. Ref: https://victoriametrics.github.io/vmauth.html. -# Configuration in the given secret must be stored under `auth.yml` key. +# Configuration in the given secret must be stored under auth.yml key. secretName: "" # -- Config file content. @@ -250,17 +250,20 @@ config: extraObjects: [] probe: + # -- readiness probe readiness: tcpSocket: port: '{{ include "vm.probe.port" . }}' initialDelaySeconds: 5 periodSeconds: 15 + # -- liveness probe liveness: tcpSocket: port: '{{ include "vm.probe.port" . }}' initialDelaySeconds: 5 periodSeconds: 15 timeoutSeconds: 5 + # -- startup probe startup: {} # -- Enterprise license key configuration for VictoriaMetrics enterprise. diff --git a/charts/victoria-metrics-cluster/README.md b/charts/victoria-metrics-cluster/README.md index a52c28108..ba4c3649d 100644 --- a/charts/victoria-metrics-cluster/README.md +++ b/charts/victoria-metrics-cluster/README.md @@ -115,7 +115,7 @@ Change the values according to the need of the environment in ``victoria-metrics cluster.local - k8s cluster domain suffix, uses for building storage pods' FQDN. Ref: [https://kubernetes.io/docs/tasks/administer-cluster/dns-custom-nameservers/](https://kubernetes.io/docs/tasks/administer-cluster/dns-custom-nameservers/) + k8s cluster domain suffix, uses for building storage pods' FQDN. Details are here extraObjects @@ -141,6 +141,24 @@ cluster.local 
 auto
+ + + + + global.image.registry + string + 
+""
+
+ + + + + global.imagePullSecrets + list + 
+[]
+
@@ -560,7 +578,7 @@ vminsert {} - Pod's node selector. Ref: [https://kubernetes.io/docs/user-guide/node-selection/](https://kubernetes.io/docs/user-guide/node-selection/) + Pod's node selector. Details are here vminsert.podAnnotations @@ -578,7 +596,7 @@ vminsert false - See `kubectl explain poddisruptionbudget.spec` for more. Ref: [https://kubernetes.io/docs/tasks/run-application/configure-pdb/](https://kubernetes.io/docs/tasks/run-application/configure-pdb/) + See kubectl explain poddisruptionbudget.spec for more. Details are here vminsert.podDisruptionBudget.labels @@ -617,112 +635,34 @@ http Name of Priority Class - vminsert.probe.liveness.failureThreshold - int - 
-3
-
- - - - - vminsert.probe.liveness.initialDelaySeconds - int - 
-5
-
- - - - - vminsert.probe.liveness.periodSeconds - int - 
-15
-
- - - - - vminsert.probe.liveness.tcpSocket.port - string - 
-'{{ dig "ports" "name" "http" (.app | dict) }}'
-
- - - - - vminsert.probe.liveness.timeoutSeconds - int - 
-5
-
- - - - - vminsert.probe.readiness.failureThreshold - int - 
-3
-
- - - - - vminsert.probe.readiness.httpGet.path - string - 
-'{{ index .app.extraArgs "http.pathPrefix" | default "" | trimSuffix "/" }}/health'
-
- - - - - vminsert.probe.readiness.httpGet.port - string - 
-'{{ dig "ports" "name" "http" (.app | dict) }}'
-
- - - - - vminsert.probe.readiness.httpGet.scheme - string - 
-'{{ ternary "HTTPS" "HTTP" (.app.extraArgs.tls | default false) }}'
-
- - - - - vminsert.probe.readiness.initialDelaySeconds - int - 
-5
-
- - - - - vminsert.probe.readiness.periodSeconds - int - 
-15
+			vminsert.probe.liveness
+			object
+			
+failureThreshold: 3
+initialDelaySeconds: 5
+periodSeconds: 15
+tcpSocket:
+    port: '{{ dig "ports" "name" "http" (.app | dict) }}'
+timeoutSeconds: 5
 

 
-			
+			vminsert liveness probe
 		
 		
-			vminsert.probe.readiness.timeoutSeconds
-			int
-			
-5
+			vminsert.probe.readiness
+			object
+			
+failureThreshold: 3
+httpGet:
+    path: '{{ index .app.extraArgs "http.pathPrefix" | default "" | trimSuffix "/" }}/health'
+    port: '{{ dig "ports" "name" "http" (.app | dict) }}'
+    scheme: '{{ ternary "HTTPS" "HTTP" (.app.extraArgs.tls | default false) }}'
+initialDelaySeconds: 5
+periodSeconds: 15
+timeoutSeconds: 5
 

 
-			
+			vminsert readiness probe
 		
 		
 			vminsert.probe.startup
@@ -731,7 +671,7 @@ http
 {}
 

 
-			
+			vminsert startup probe
 		
 		
 			vminsert.replicaCount
@@ -758,7 +698,7 @@ http
 enabled: false
- Pod's security context. Ref: [https://kubernetes.io/docs/tasks/configure-pod-container/security-context/](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/) + Pod's security context. Details are here vminsert.service.annotations @@ -785,7 +725,7 @@ enabled: false [] - Service External IPs. Ref: [https://kubernetes.io/docs/user-guide/services/#external-ips]( https://kubernetes.io/docs/user-guide/services/#external-ips) + Service External IPs. Details are here vminsert.service.extraPorts @@ -938,7 +878,7 @@ false false - Suppress rendering `--storageNode` FQDNs based on `vmstorage.replicaCount` value. If true suppress rendering `--storageNodes`, they can be re-defined in extraArgs + Suppress rendering --storageNode FQDNs based on vmstorage.replicaCount value. If true suppress rendering --storageNodes, they can be re-defined in extraArgs vminsert.tolerations @@ -947,7 +887,7 @@ false [] - Array of tolerations object. Ref: [https://kubernetes.io/docs/concepts/configuration/assign-pod-node/](https://kubernetes.io/docs/concepts/configuration/assign-pod-node/) + Array of tolerations object. Details are here vminsert.topologySpreadConstraints @@ -1003,6 +943,15 @@ true Container workdir + + vmselect.emptyDir + object + 
+{}
+
+ + + vmselect.enabled bool @@ -1280,7 +1229,7 @@ vmselect {} - Pod's node selector. Ref: [https://kubernetes.io/docs/user-guide/node-selection/](https://kubernetes.io/docs/user-guide/node-selection/) + Pod's node selector. Details are here vmselect.persistentVolume.accessModes @@ -1289,7 +1238,7 @@ vmselect - ReadWriteOnce - Array of access mode. Must match those of existing PV or dynamic provisioner. Ref: [http://kubernetes.io/docs/user-guide/persistent-volumes/](http://kubernetes.io/docs/user-guide/persistent-volumes/) + Array of access mode. Must match those of existing PV or dynamic provisioner. Details are here vmselect.persistentVolume.annotations @@ -1361,7 +1310,7 @@ false false - See `kubectl explain poddisruptionbudget.spec` for more. Ref: https://kubernetes.io/docs/tasks/run-application/configure-pdb/ + See kubectl explain poddisruptionbudget.spec for more. Details are here vmselect.podDisruptionBudget.labels @@ -1400,112 +1349,34 @@ http Name of Priority Class - vmselect.probe.liveness.failureThreshold - int - 
-3
-
- - - - - vmselect.probe.liveness.initialDelaySeconds - int - 
-5
-
- - - - - vmselect.probe.liveness.periodSeconds - int - 
-15
-
- - - - - vmselect.probe.liveness.tcpSocket.port - string - 
-'{{ include "vm.probe.port" . }}'
-
- - - - - vmselect.probe.liveness.timeoutSeconds - int - 
-5
-
- - - - - vmselect.probe.readiness.failureThreshold - int - 
-3
-
- - - - - vmselect.probe.readiness.httpGet.path - string - 
-'{{ include "vm.probe.http.path" . }}'
-
- - - - - vmselect.probe.readiness.httpGet.port - string - 
-'{{ include "vm.probe.port" . }}'
-
- - - - - vmselect.probe.readiness.httpGet.scheme - string - 
-'{{ include "vm.probe.http.scheme" . }}'
-
- - - - - vmselect.probe.readiness.initialDelaySeconds - int - 
-5
-
- - - - - vmselect.probe.readiness.periodSeconds - int - 
-15
+			vmselect.probe.liveness
+			object
+			
+failureThreshold: 3
+initialDelaySeconds: 5
+periodSeconds: 15
+tcpSocket:
+    port: '{{ include "vm.probe.port" . }}'
+timeoutSeconds: 5
 

 
-			
+			vmselect liveness probe
 		
 		
-			vmselect.probe.readiness.timeoutSeconds
-			int
-			
-5
+			vmselect.probe.readiness
+			object
+			
+failureThreshold: 3
+httpGet:
+    path: '{{ include "vm.probe.http.path" . }}'
+    port: '{{ include "vm.probe.port" . }}'
+    scheme: '{{ include "vm.probe.http.scheme" . }}'
+initialDelaySeconds: 5
+periodSeconds: 15
+timeoutSeconds: 5
 

 
-			
+			vmselect readiness probe
 		
 		
 			vmselect.probe.startup
@@ -1514,7 +1385,7 @@ http
 {}
 

 
-			
+			vmselect startup probe
 		
 		
 			vmselect.replicaCount
@@ -1541,7 +1412,7 @@ http
 enabled: true
- Pod's security context. Ref: [https://kubernetes.io/docs/tasks/configure-pod-container/security-context/](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/ + Pod's security context. Details are here vmselect.service.annotations @@ -1568,7 +1439,7 @@ enabled: true [] - Service External IPs. Ref: [https://kubernetes.io/docs/user-guide/services/#external-ips](https://kubernetes.io/docs/user-guide/services/#external-ips) + Service External IPs. Details are here vmselect.service.extraPorts @@ -1757,7 +1628,7 @@ OrderedReady false - Suppress rendering `--storageNode` FQDNs based on `vmstorage.replicaCount` value. If true suppress rendering `--storageNodes`, they can be re-defined in extraArgs + Suppress rendering --storageNode FQDNs based on vmstorage.replicaCount value. If true suppress rendering --storageNodes, they can be re-defined in extraArgs vmselect.tolerations @@ -1766,7 +1637,7 @@ false [] - Array of tolerations object. Ref: [https://kubernetes.io/docs/concepts/configuration/assign-pod-node/](https://kubernetes.io/docs/concepts/configuration/assign-pod-node/) + Array of tolerations object. Details are here vmselect.topologySpreadConstraints @@ -1813,6 +1684,15 @@ true Container workdir + + vmstorage.emptyDir + object + 
+{}
+
+ + + vmstorage.enabled bool @@ -2000,7 +1880,7 @@ vmstorage {} - Pod's node selector. Ref: [https://kubernetes.io/docs/user-guide/node-selection/](https://kubernetes.io/docs/user-guide/node-selection/) + Pod's node selector. Details are here vmstorage.persistentVolume.accessModes @@ -2009,7 +1889,7 @@ vmstorage - ReadWriteOnce - Array of access modes. Must match those of existing PV or dynamic provisioner. Ref: [http://kubernetes.io/docs/user-guide/persistent-volumes/](http://kubernetes.io/docs/user-guide/persistent-volumes/) + Array of access modes. Must match those of existing PV or dynamic provisioner. Details are here vmstorage.persistentVolume.annotations @@ -2109,7 +1989,7 @@ enabled: false labels: {} - See `kubectl explain poddisruptionbudget.spec` for more. Ref: [https://kubernetes.io/docs/tasks/run-application/configure-pdb/](https://kubernetes.io/docs/tasks/run-application/configure-pdb/) + See kubectl explain poddisruptionbudget.spec for more. Details are here vmstorage.podManagementPolicy @@ -2148,112 +2028,34 @@ http Name of Priority Class - vmstorage.probe.liveness.failureThreshold - int - 
-10
-
- - - - - vmstorage.probe.liveness.initialDelaySeconds - int - 
-30
-
- - - - - vmstorage.probe.liveness.periodSeconds - int - 
-30
-
- - - - - vmstorage.probe.liveness.tcpSocket.port - string - 
-'{{ include "vm.probe.port" . }}'
-
- - - - - vmstorage.probe.liveness.timeoutSeconds - int - 
-5
-
- - - - - vmstorage.probe.readiness.failureThreshold - int - 
-3
-
- - - - - vmstorage.probe.readiness.httpGet.path - string - 
-'{{ include "vm.probe.http.path" . }}'
-
- - - - - vmstorage.probe.readiness.httpGet.port - string - 
-'{{ include "vm.probe.port" . }}'
-
- - - - - vmstorage.probe.readiness.httpGet.scheme - string - 
-'{{ include "vm.probe.http.scheme" . }}'
-
- - - - - vmstorage.probe.readiness.initialDelaySeconds - int - 
-5
-
- - - - - vmstorage.probe.readiness.periodSeconds - int - 
-15
+			vmstorage.probe.liveness
+			object
+			
+failureThreshold: 10
+initialDelaySeconds: 30
+periodSeconds: 30
+tcpSocket:
+    port: '{{ include "vm.probe.port" . }}'
+timeoutSeconds: 5
 

 
-			
+			vmstorage liveness probe
 		
 		
-			vmstorage.probe.readiness.timeoutSeconds
-			int
-			
-5
+			vmstorage.probe.readiness
+			object
+			
+failureThreshold: 3
+httpGet:
+    path: '{{ include "vm.probe.http.path" . }}'
+    port: '{{ include "vm.probe.port" . }}'
+    scheme: '{{ include "vm.probe.http.scheme" . }}'
+initialDelaySeconds: 5
+periodSeconds: 15
+timeoutSeconds: 5
 

 
-			
+			vmstorage readiness probe
 		
 		
 			vmstorage.probe.startup
@@ -2262,7 +2064,7 @@ http
 {}
 

 
-			
+			vmstorage startup probe
 		
 		
 			vmstorage.replicaCount
@@ -2280,7 +2082,7 @@ http
 {}
- Resource object. Ref: [https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/) + Resource object. Details are here vmstorage.retentionPeriod @@ -2298,7 +2100,7 @@ http enabled: false - Pod's security context. Ref: [https://kubernetes.io/docs/tasks/configure-pod-container/security-context/](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/) + Pod's security context. Details are here vmstorage.service.annotations @@ -2433,7 +2235,7 @@ false [] - Array of tolerations object. Node tolerations for server scheduling to nodes with taints. Ref: [https://kubernetes.io/docs/concepts/configuration/assign-pod-node/](https://kubernetes.io/docs/concepts/configuration/assign-pod-node/) # + Array of tolerations object. Node tolerations for server scheduling to nodes with taints. Details are here # vmstorage.topologySpreadConstraints @@ -2589,112 +2391,34 @@ cluster - vmstorage.vmbackupmanager.probe.liveness.failureThreshold - int - 
-10
-
- - - - - vmstorage.vmbackupmanager.probe.liveness.initialDelaySeconds - int - 
-30
-
- - - - - vmstorage.vmbackupmanager.probe.liveness.periodSeconds - int - 
-30
-
- - - - - vmstorage.vmbackupmanager.probe.liveness.tcpSocket.port - string - 
-manager-http
-
- - - - - vmstorage.vmbackupmanager.probe.liveness.timeoutSeconds - int - 
-5
-
- - - - - vmstorage.vmbackupmanager.probe.readiness.failureThreshold - int - 
-3
-
- - - - - vmstorage.vmbackupmanager.probe.readiness.httpGet.path - string - 
-'{{ include "vm.probe.http.path" . }}'
-
- - - - - vmstorage.vmbackupmanager.probe.readiness.httpGet.port - string - 
-manager-http
-
- - - - - vmstorage.vmbackupmanager.probe.readiness.httpGet.scheme - string - 
-'{{ include "vm.probe.http.scheme" . }}'
-
- - - - - vmstorage.vmbackupmanager.probe.readiness.initialDelaySeconds - int - 
-5
-
- - - - - vmstorage.vmbackupmanager.probe.readiness.periodSeconds - int - 
-15
+			vmstorage.vmbackupmanager.probe.liveness
+			object
+			
+failureThreshold: 10
+initialDelaySeconds: 30
+periodSeconds: 30
+tcpSocket:
+    port: manager-http
+timeoutSeconds: 5
 

 
-			
+			vmbackupmanager liveness probe
 		
 		
-			vmstorage.vmbackupmanager.probe.readiness.timeoutSeconds
-			int
-			
-5
+			vmstorage.vmbackupmanager.probe.readiness
+			object
+			
+failureThreshold: 3
+httpGet:
+    path: '{{ include "vm.probe.http.path" . }}'
+    port: manager-http
+    scheme: '{{ include "vm.probe.http.scheme" . }}'
+initialDelaySeconds: 5
+periodSeconds: 15
+timeoutSeconds: 5
 

 
-			
+			vmbackupmanager readiness probe
 		
 		
 			vmstorage.vmbackupmanager.probe.startup
@@ -2703,7 +2427,7 @@ manager-http
 {}
 

 
-			
+			vmbackupmanager startup probe
 		
 		
 			vmstorage.vmbackupmanager.resources
@@ -2774,3 +2498,4 @@ keepLastWeekly: 2
 		
 	
 
+
diff --git a/charts/victoria-metrics-cluster/values.yaml b/charts/victoria-metrics-cluster/values.yaml
index 3622c487b..bcf17df96 100644
--- a/charts/victoria-metrics-cluster/values.yaml
+++ b/charts/victoria-metrics-cluster/values.yaml
@@ -9,7 +9,7 @@ global:
     openshift:
       adaptSecurityContext: "auto"
 
-# -- k8s cluster domain suffix, uses for building storage pods' FQDN. Ref: [https://kubernetes.io/docs/tasks/administer-cluster/dns-custom-nameservers/](https://kubernetes.io/docs/tasks/administer-cluster/dns-custom-nameservers/)
+# -- k8s cluster domain suffix, uses for building storage pods' FQDN. Details are here
 clusterDomainSuffix: cluster.local
 printNotes: true
 
@@ -67,7 +67,7 @@ vmselect:
   priorityClassName: ""
   # -- Overrides the full name of vmselect component
   fullnameOverride: ""
-  # -- Suppress rendering `--storageNode` FQDNs based on `vmstorage.replicaCount` value. If true suppress rendering `--storageNodes`, they can be re-defined in extraArgs
+  # -- Suppress rendering --storageNode FQDNs based on vmstorage.replicaCount value. If true suppress rendering --storageNodes, they can be re-defined in extraArgs
   suppressStorageFQDNsRender: false
   automountServiceAccountToken: true
   # Extra command line arguments for vmselect component
@@ -84,7 +84,7 @@ vmselect:
     #    name: special-config
 
   probe:
-    # Readiness probe
+    # -- vmselect readiness probe
     readiness:
       httpGet:
         path: '{{ include "vm.probe.http.path" . }}'
@@ -94,7 +94,7 @@ vmselect:
       periodSeconds: 15
       timeoutSeconds: 5
       failureThreshold: 3
-    # Liveness probe
+    # -- vmselect liveness probe
     liveness:
       tcpSocket:
         port: '{{ include "vm.probe.port" . }}'
@@ -102,7 +102,7 @@ vmselect:
       periodSeconds: 15
       timeoutSeconds: 5
       failureThreshold: 3
-    # Startup probe
+    # -- vmselect startup probe
     startup: {}
 
   horizontalPodAutoscaler:
@@ -150,20 +150,20 @@ vmselect:
     #   image: example-image
 
   podDisruptionBudget:
-    # -- See `kubectl explain poddisruptionbudget.spec` for more. Ref: https://kubernetes.io/docs/tasks/run-application/configure-pdb/
+    # -- See kubectl explain poddisruptionbudget.spec for more. Details are here
     enabled: false
     # minAvailable: 1
     # maxUnavailable: 1
     labels: {}
 
-  # -- Array of tolerations object. Ref: [https://kubernetes.io/docs/concepts/configuration/assign-pod-node/](https://kubernetes.io/docs/concepts/configuration/assign-pod-node/)
+  # -- Array of tolerations object. Details are here
   tolerations: []
     # - key: "key"
     #   operator: "Equal|Exists"
     #   value: "value"
     #   effect: "NoSchedule|PreferNoSchedule"
 
-  # -- Pod's node selector. Ref: [https://kubernetes.io/docs/user-guide/node-selection/](https://kubernetes.io/docs/user-guide/node-selection/)
+  # -- Pod's node selector. Details are here
   nodeSelector: {}
   # -- Pod affinity
   affinity: {}
@@ -184,7 +184,7 @@ vmselect:
     #   cpu: 50m
     #   memory: 64Mi
 
-  # -- Pod's security context. Ref: [https://kubernetes.io/docs/tasks/configure-pod-container/security-context/](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/
+  # -- Pod's security context. Details are here
   securityContext:
     enabled: true
   podSecurityContext:
@@ -198,7 +198,7 @@ vmselect:
     labels: {}
     # -- Service ClusterIP
     clusterIP: ""
-    # -- Service External IPs. Ref: [https://kubernetes.io/docs/user-guide/services/#external-ips](https://kubernetes.io/docs/user-guide/services/#external-ips)
+    # -- Service External IPs. Details are here
     externalIPs: []
     # -- Extra service ports
     extraPorts: []
@@ -254,7 +254,7 @@ vmselect:
     # -- Create/use Persistent Volume Claim for vmselect component. Empty dir if false. If true, vmselect will create/use a Persistent Volume Claim
     enabled: false
 
-    # -- Array of access mode. Must match those of existing PV or dynamic provisioner. Ref: [http://kubernetes.io/docs/user-guide/persistent-volumes/](http://kubernetes.io/docs/user-guide/persistent-volumes/)
+    # -- Array of access mode. Must match those of existing PV or dynamic provisioner. Details are here
     accessModes:
       - ReadWriteOnce
     # -- Persistent volume annotations
@@ -339,12 +339,13 @@ vminsert:
     #- configMapRef:
     #    name: special-config
 
-  # -- Suppress rendering `--storageNode` FQDNs based on `vmstorage.replicaCount` value. If true suppress rendering `--storageNodes`, they can be re-defined in extraArgs
+  # -- Suppress rendering --storageNode FQDNs based on vmstorage.replicaCount value. If true suppress rendering --storageNodes, they can be re-defined in extraArgs
   suppressStorageFQDNsRender: false
   automountServiceAccountToken: true
 
   # Readiness & Liveness probes
   probe:
+    # -- vminsert readiness probe
     readiness:
       httpGet:
         path: '{{ index .app.extraArgs "http.pathPrefix" | default "" | trimSuffix "/" }}/health'
@@ -354,6 +355,7 @@ vminsert:
       periodSeconds: 15
       timeoutSeconds: 5
       failureThreshold: 3
+    # -- vminsert liveness probe
     liveness:
       tcpSocket:
         port: '{{ dig "ports" "name" "http" (.app | dict) }}'
@@ -361,6 +363,7 @@ vminsert:
       periodSeconds: 15
       timeoutSeconds: 5
       failureThreshold: 3
+    # -- vminsert startup probe
     startup: {}
 
 # Horizontal Pod Autoscaling
@@ -400,20 +403,20 @@ vminsert:
     #   image: example-image
 
   podDisruptionBudget:
-    # -- See `kubectl explain poddisruptionbudget.spec` for more. Ref: [https://kubernetes.io/docs/tasks/run-application/configure-pdb/](https://kubernetes.io/docs/tasks/run-application/configure-pdb/)
+    # -- See kubectl explain poddisruptionbudget.spec for more. Details are here
     enabled: false
     # minAvailable: 1
     # maxUnavailable: 1
     labels: {}
 
-  # -- Array of tolerations object. Ref: [https://kubernetes.io/docs/concepts/configuration/assign-pod-node/](https://kubernetes.io/docs/concepts/configuration/assign-pod-node/)
+  # -- Array of tolerations object. Details are here
   tolerations: []
     # - key: "key"
     #   operator: "Equal|Exists"
     #   value: "value"
     #   effect: "NoSchedule|PreferNoSchedule"
 
-  # -- Pod's node selector. Ref: [https://kubernetes.io/docs/user-guide/node-selection/](https://kubernetes.io/docs/user-guide/node-selection/)
+  # -- Pod's node selector. Details are here
   nodeSelector: {}
   # -- Pod affinity
   affinity: {}
@@ -433,7 +436,7 @@ vminsert:
     # requests:
     #   cpu: 50m
     #   memory: 64Mi
-  # -- Pod's security context. Ref: [https://kubernetes.io/docs/tasks/configure-pod-container/security-context/](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/)
+  # -- Pod's security context. Details are here
   securityContext:
     enabled: false
   podSecurityContext:
@@ -445,7 +448,7 @@ vminsert:
     labels: {}
     # -- Service ClusterIP
     clusterIP: ""
-    # -- Service External IPs. Ref: [https://kubernetes.io/docs/user-guide/services/#external-ips]( https://kubernetes.io/docs/user-guide/services/#external-ips)
+    # -- Service External IPs. Details are here
     externalIPs: []
     # -- Extra service ports
     extraPorts: []
@@ -598,14 +601,14 @@ vmstorage:
     #   - -src=s3://your_bucket/folder/latest
     #   - -credsFilePath=/etc/vm/creds/credentials
 
-  # -- See `kubectl explain poddisruptionbudget.spec` for more. Ref: [https://kubernetes.io/docs/tasks/run-application/configure-pdb/](https://kubernetes.io/docs/tasks/run-application/configure-pdb/)
+  # -- See kubectl explain poddisruptionbudget.spec for more. Details are here
   podDisruptionBudget:
     enabled: false
     # minAvailable: 1
     # maxUnavailable: 1
     labels: {}
 
-  # -- Array of tolerations object. Node tolerations for server scheduling to nodes with taints. Ref: [https://kubernetes.io/docs/concepts/configuration/assign-pod-node/](https://kubernetes.io/docs/concepts/configuration/assign-pod-node/)
+  # -- Array of tolerations object. Node tolerations for server scheduling to nodes with taints. Details are here
   ##
   tolerations:
     []
@@ -614,7 +617,7 @@ vmstorage:
     #   value: "value"
     #   effect: "NoSchedule|PreferNoSchedule"
 
-  # -- Pod's node selector. Ref: [https://kubernetes.io/docs/user-guide/node-selection/](https://kubernetes.io/docs/user-guide/node-selection/)
+  # -- Pod's node selector. Details are here
   nodeSelector: {}
 
   # -- Pod affinity
@@ -634,7 +637,7 @@ vmstorage:
     enabled: true
     name: vmstorage-volume
 
-    # -- Array of access modes. Must match those of existing PV or dynamic provisioner. Ref: [http://kubernetes.io/docs/user-guide/persistent-volumes/](http://kubernetes.io/docs/user-guide/persistent-volumes/)
+    # -- Array of access modes. Must match those of existing PV or dynamic provisioner. Details are here
     accessModes:
       - ReadWriteOnce
     # -- Persistent volume annotations
@@ -664,7 +667,7 @@ vmstorage:
   # -- Deploy order policy for StatefulSet pods
   podManagementPolicy: OrderedReady
 
-  # -- Resource object. Ref: [https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/)
+  # -- Resource object. Details are here
   resources: {}
     # limits:
     #   cpu: 500m
@@ -673,7 +676,7 @@ vmstorage:
     #   cpu: 500m
     #   memory: 512Mi
 
-  # -- Pod's security context. Ref: [https://kubernetes.io/docs/tasks/configure-pod-container/security-context/](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/)
+  # -- Pod's security context. Details are here
   securityContext:
     enabled: false
   podSecurityContext:
@@ -694,6 +697,7 @@ vmstorage:
   # -- Pod's termination grace period in seconds
   terminationGracePeriodSeconds: 60
   probe:
+    # -- vmstorage readiness probe
     readiness:
       httpGet:
         path: '{{ include "vm.probe.http.path" . }}'
@@ -703,6 +707,7 @@ vmstorage:
       periodSeconds: 15
       timeoutSeconds: 5
       failureThreshold: 3
+    # -- vmstorage liveness probe
     liveness:
       tcpSocket:
         port: '{{ include "vm.probe.port" . }}'
@@ -710,6 +715,7 @@ vmstorage:
       periodSeconds: 30
       timeoutSeconds: 5
       failureThreshold: 10
+    # -- vmstorage startup probe
     startup: {}
   vmbackupmanager:
     # -- enable automatic creation of backup via vmbackupmanager. vmbackupmanager is part of Enterprise packages
@@ -762,6 +768,7 @@ vmstorage:
     # -- Additional environment variables (ex.: secret tokens, flags) https://docs.victoriametrics.com/#environment-variables
     env: []
     probe:
+      # -- vmbackupmanager readiness probe
       readiness:
         httpGet:
           path: '{{ include "vm.probe.http.path" . }}'
@@ -771,6 +778,7 @@ vmstorage:
         periodSeconds: 15
         timeoutSeconds: 5
         failureThreshold: 3
+      # -- vmbackupmanager liveness probe
       liveness:
         tcpSocket:
           port: manager-http
@@ -778,6 +786,7 @@ vmstorage:
         periodSeconds: 30
         timeoutSeconds: 5
         failureThreshold: 10
+      # -- vmbackupmanager startup probe
       startup: {}
     extraSecretMounts:
       []
diff --git a/charts/victoria-metrics-distributed/README.md b/charts/victoria-metrics-distributed/README.md
index b9e5881f7..7151f7d11 100644
--- a/charts/victoria-metrics-distributed/README.md
+++ b/charts/victoria-metrics-distributed/README.md
@@ -377,7 +377,7 @@ name: ""
 spec: {}
- set up a vmauth with all the zone with `allowQuery: true` as query backends + set up a vmauth with all the zone with allowQuery: true as query backends availabilityZones[0].vmauthIngest.name diff --git a/charts/victoria-metrics-distributed/values.yaml b/charts/victoria-metrics-distributed/values.yaml index 8a1525f49..f46a39cf7 100644 --- a/charts/victoria-metrics-distributed/values.yaml +++ b/charts/victoria-metrics-distributed/values.yaml @@ -58,7 +58,7 @@ availabilityZones: spec: extraArgs: discoverBackendIPs: "true" - # -- set up a vmauth with all the zone with `allowQuery: true` as query backends + # -- set up a vmauth with all the zone with allowQuery: true as query backends vmauthCrossAZQuery: enabled: true name: "" @@ -197,7 +197,7 @@ availabilityZones: # spec: # extraArgs: # discoverBackendIPs: "true" - # # -- set up a vmauth with all the zone with `allowQuery: true` as query backends + # # -- set up a vmauth with all the zone with allowQuery: true as query backends # vmauthCrossAZQuery: # enabled: true # name: "" diff --git a/charts/victoria-metrics-gateway/README.md b/charts/victoria-metrics-gateway/README.md index 91248e93f..bec82528d 100644 --- a/charts/victoria-metrics-gateway/README.md +++ b/charts/victoria-metrics-gateway/README.md @@ -337,6 +337,24 @@ json 
 auto
+ + + + + global.image.registry + string + 
+""
+
+ + + + + global.imagePullSecrets + list + 
+[]
+
@@ -532,7 +550,7 @@ enabled: false labels: {} - See `kubectl explain poddisruptionbudget.spec` for more. Ref: https://kubernetes.io/docs/tasks/run-application/configure-pdb/ + See kubectl explain poddisruptionbudget.spec for more. Ref: https://kubernetes.io/docs/tasks/run-application/configure-pdb/ podSecurityContext.enabled @@ -544,85 +562,31 @@ true - probe.liveness.initialDelaySeconds - int - 
-5
-
- - - - - probe.liveness.periodSeconds - int - 
-15
-
- - - - - probe.liveness.tcpSocket.port - string - 
-'{{ include "vm.probe.port" . }}'
-
- - - - - probe.liveness.timeoutSeconds - int - 
-5
-
- - - - - probe.readiness.httpGet.path - string - 
-'{{ include "vm.probe.http.path" . }}'
-
- - - - - probe.readiness.httpGet.port - string - 
-'{{ include "vm.probe.port" . }}'
-
- - - - - probe.readiness.httpGet.scheme - string - 
-'{{ include "vm.probe.http.scheme" . }}'
-
- - - - - probe.readiness.initialDelaySeconds - int - 
-5
+			probe.liveness
+			object
+			
+initialDelaySeconds: 5
+periodSeconds: 15
+tcpSocket:
+    port: '{{ include "vm.probe.port" . }}'
+timeoutSeconds: 5
 

 
-			
+			liveness probe
 		
 		
-			probe.readiness.periodSeconds
-			int
-			
-15
+			probe.readiness
+			object
+			
+httpGet:
+    path: '{{ include "vm.probe.http.path" . }}'
+    port: '{{ include "vm.probe.port" . }}'
+    scheme: '{{ include "vm.probe.http.scheme" . }}'
+initialDelaySeconds: 5
+periodSeconds: 15
 

 
-			
+			readiness probe
 		
 		
 			probe.startup
@@ -631,7 +595,7 @@ true
 {}
 

 
-			
+			startup probe
 		
 		
 			rateLimiter
@@ -908,3 +872,4 @@ false
 		
 	
 
+
diff --git a/charts/victoria-metrics-gateway/values.yaml b/charts/victoria-metrics-gateway/values.yaml
index eea299c89..42fd0e36c 100644
--- a/charts/victoria-metrics-gateway/values.yaml
+++ b/charts/victoria-metrics-gateway/values.yaml
@@ -40,7 +40,7 @@ serviceAccount:
   # -- The name of the service account to use. If not set and create is true, a name is generated using the fullname template
   name:
 
-# -- See `kubectl explain poddisruptionbudget.spec` for more. Ref: https://kubernetes.io/docs/tasks/run-application/configure-pdb/
+# -- See kubectl explain poddisruptionbudget.spec for more. Ref: https://kubernetes.io/docs/tasks/run-application/configure-pdb/
 podDisruptionBudget:
   enabled: false
   # minAvailable: 1
@@ -229,6 +229,7 @@ write:
   url: ""
 
 probe:
+  # -- readiness probe
   readiness:
     httpGet:
       path: '{{ include "vm.probe.http.path" . }}'
@@ -236,12 +237,14 @@ probe:
       port: '{{ include "vm.probe.port" . }}'
     initialDelaySeconds: 5
     periodSeconds: 15
+  # -- liveness probe
   liveness:
     tcpSocket:
       port: '{{ include "vm.probe.port" . }}'
     initialDelaySeconds: 5
     periodSeconds: 15
     timeoutSeconds: 5
+  # -- startup probe
   startup: {}
 
 # -- Enterprise license key configuration for VictoriaMetrics enterprise.
diff --git a/charts/victoria-metrics-k8s-stack/values.yaml b/charts/victoria-metrics-k8s-stack/values.yaml
index 3867bc2e7..e83a332f3 100644
--- a/charts/victoria-metrics-k8s-stack/values.yaml
+++ b/charts/victoria-metrics-k8s-stack/values.yaml
@@ -826,7 +826,7 @@ grafana:
   #    allow_loading_unsigned_plugins: victoriametrics-datasource
 
   # Change datasource type in dashboards from Prometheus to VictoriaMetrics.
-  # you can use `victoriametrics-datasource` instead of `prometheus` if enabled VictoriaMetrics Datasource above
+  # you can use victoriametrics-datasource instead of prometheus if enabled VictoriaMetrics Datasource above
   defaultDatasourceType: "prometheus"
 
   ingress:
diff --git a/charts/victoria-metrics-operator/README.md b/charts/victoria-metrics-operator/README.md
index fff197f28..7320b9058 100644
--- a/charts/victoria-metrics-operator/README.md
+++ b/charts/victoria-metrics-operator/README.md
@@ -275,7 +275,7 @@ true
 []
- extra settings for the operator deployment. full list Ref: [https://github.com/VictoriaMetrics/operator/blob/master/vars.MD](https://github.com/VictoriaMetrics/operator/blob/master/vars.MD) + extra settings for the operator deployment. Full list here envFrom @@ -358,6 +358,37 @@ true Overrides the full name of server component + + global.image.registry + string + 
+""
+
+ + + + + global.imagePullSecrets + list + 
+[]
+
+ + + + + image + object + 
+pullPolicy: IfNotPresent
+registry: ""
+repository: victoriametrics/operator
+tag: ""
+variant: ""
+
+ + operator image configuration + image.pullPolicy string @@ -394,15 +425,6 @@ victoriametrics/operator Image tag override Chart.AppVersion - - image.variant - string - 
-""
-
- - - imagePullSecrets list @@ -437,7 +459,7 @@ info {} - Pod's node selector. Ref: [https://kubernetes.io/docs/user-guide/node-selection/](https://kubernetes.io/docs/user-guide/node-selection/ + Pod's node selector. Details are here operator.disable_prometheus_converter @@ -512,112 +534,34 @@ false - probe.liveness.failureThreshold - int - 
-3
-
- - - - - probe.liveness.initialDelaySeconds - int - 
-5
-
- - - - - probe.liveness.periodSeconds - int - 
-15
-
- - - - - probe.liveness.tcpSocket.port - string - 
-probe
-
- - - - - probe.liveness.timeoutSeconds - int - 
-5
-
- - - - - probe.readiness.failureThreshold - int - 
-3
-
- - - - - probe.readiness.httpGet.path - string - 
-'{{ include "vm.probe.http.path" . }}'
-
- - - - - probe.readiness.httpGet.port - string - 
-probe
-
- - - - - probe.readiness.httpGet.scheme - string - 
-'{{ include "vm.probe.http.scheme" . }}'
-
- - - - - probe.readiness.initialDelaySeconds - int - 
-5
-
- - - - - probe.readiness.periodSeconds - int - 
-15
+			probe.liveness
+			object
+			
+failureThreshold: 3
+initialDelaySeconds: 5
+periodSeconds: 15
+tcpSocket:
+    port: probe
+timeoutSeconds: 5
 

 
-			
+			Liveness probe
 		
 		
-			probe.readiness.timeoutSeconds
-			int
-			
-5
+			probe.readiness
+			object
+			
+failureThreshold: 3
+httpGet:
+    path: '{{ include "vm.probe.http.path" . }}'
+    port: probe
+    scheme: '{{ include "vm.probe.http.scheme" . }}'
+initialDelaySeconds: 5
+periodSeconds: 15
+timeoutSeconds: 5
 

 
-			
+			Readiness probe
 		
 		
 			probe.startup
@@ -626,7 +570,7 @@ probe
 {}
 

 
-			
+			Startup probe
 		
 		
 			rbac.aggregatedClusterRoles
@@ -727,7 +671,7 @@ relabelings: []
 []
- Array of tolerations object. Ref: [https://kubernetes.io/docs/concepts/configuration/assign-pod-node/](https://kubernetes.io/docs/concepts/configuration/assign-pod-node/) + Array of tolerations object. Spec is here topologySpreadConstraints @@ -736,7 +680,7 @@ relabelings: [] [] - Pod Topology Spread Constraints. Ref: [https://kubernetes.io/docs/concepts/scheduling-eviction/topology-spread-constraints/](https://kubernetes.io/docs/concepts/scheduling-eviction/topology-spread-constraints/) + Pod Topology Spread Constraints. Spec is here watchNamespace @@ -748,4 +692,5 @@ relabelings: [] - \ No newline at end of file + + diff --git a/charts/victoria-metrics-operator/values.yaml b/charts/victoria-metrics-operator/values.yaml index b869e3a74..beb34741b 100644 --- a/charts/victoria-metrics-operator/values.yaml +++ b/charts/victoria-metrics-operator/values.yaml @@ -5,6 +5,7 @@ global: # Default values for victoria-metrics. # This is a YAML-formatted file. # Declare variables to be passed into your templates. +# -- operator image configuration image: # -- Image registry registry: "" @@ -92,8 +93,7 @@ serviceAccount: # -- The name of the service account to use. If not set and create is true, a name is generated using the fullname template name: "" -## See `kubectl explain poddisruptionbudget.spec` for more -## ref: https://kubernetes.io/docs/tasks/run-application/configure-pdb/ +## -- See kubectl explain poddisruptionbudget.spec for more or check these docs podDisruptionBudget: enabled: false # minAvailable: 1 @@ -110,22 +110,22 @@ resources: # cpu: 80m # memory: 120Mi -# -- Pod's node selector. Ref: [https://kubernetes.io/docs/user-guide/node-selection/](https://kubernetes.io/docs/user-guide/node-selection/ +# -- Pod's node selector. Details are here nodeSelector: {} -# -- Array of tolerations object. Ref: [https://kubernetes.io/docs/concepts/configuration/assign-pod-node/](https://kubernetes.io/docs/concepts/configuration/assign-pod-node/) +# -- Array of tolerations object. Spec is here tolerations: [] # -- Pod affinity affinity: {} -# -- Pod Topology Spread Constraints. Ref: [https://kubernetes.io/docs/concepts/scheduling-eviction/topology-spread-constraints/](https://kubernetes.io/docs/concepts/scheduling-eviction/topology-spread-constraints/) +# -- Pod Topology Spread Constraints. Spec is here topologySpreadConstraints: [] # -- operator container additional commandline arguments extraArgs: {} -# -- extra settings for the operator deployment. full list Ref: [https://github.com/VictoriaMetrics/operator/blob/master/vars.MD](https://github.com/VictoriaMetrics/operator/blob/master/vars.MD) +# -- extra settings for the operator deployment. Full list here env: [] # - name: VM_VMSINGLEDEFAULT_VERSION @@ -197,7 +197,7 @@ serviceMonitor: relabelings: [] probe: - # Readiness probe + # -- Readiness probe readiness: httpGet: path: '{{ include "vm.probe.http.path" . }}' @@ -207,7 +207,7 @@ probe: periodSeconds: 15 timeoutSeconds: 5 failureThreshold: 3 - # Liveness probe + # -- Liveness probe liveness: tcpSocket: port: probe @@ -215,7 +215,7 @@ probe: periodSeconds: 15 timeoutSeconds: 5 failureThreshold: 3 - # Startup probe + # -- Startup probe startup: {} # -- Add extra specs dynamically to this chart diff --git a/charts/victoria-metrics-single/README.md b/charts/victoria-metrics-single/README.md index 7c19d29ec..c500c36ee 100644 --- a/charts/victoria-metrics-single/README.md +++ b/charts/victoria-metrics-single/README.md @@ -132,6 +132,24 @@ true 
 auto
+ + + + + global.image.registry + string + 
+""
+
+ + + + + global.imagePullSecrets + list + 
+[]
+
@@ -191,7 +209,7 @@ name: "" false - See `kubectl explain poddisruptionbudget.spec` for more. Ref: [https://kubernetes.io/docs/tasks/run-application/configure-pdb/](https://kubernetes.io/docs/tasks/run-application/configure-pdb/) + See kubectl explain poddisruptionbudget.spec for more. Details are here podDisruptionBudget.extraLabels @@ -406,6 +424,15 @@ victoriametrics/victoria-metrics 
 ""
+ + + + + server.imagePullSecrets + list + 
+[]
+
@@ -488,7 +515,7 @@ server {} - Pod's node selector. Ref: [https://kubernetes.io/docs/user-guide/node-selection/](https://kubernetes.io/docs/user-guide/node-selection/) + Pod's node selector. Details are here server.persistentVolume.accessModes @@ -497,7 +524,7 @@ server - ReadWriteOnce - Array of access modes. Must match those of existing PV or dynamic provisioner. Ref: [http://kubernetes.io/docs/user-guide/persistent-volumes/](http://kubernetes.io/docs/user-guide/persistent-volumes/) + Array of access modes. Must match those of existing PV or dynamic provisioner. Details are here server.persistentVolume.annotations @@ -605,7 +632,7 @@ OrderedReady enabled: true - Pod's security context. Ref: [https://kubernetes.io/docs/tasks/configure-pod-container/security-context/](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/) + Pod's security context. Details are here server.priorityClassName @@ -740,7 +767,7 @@ enabled: true {} - Resource object. Ref: [http://kubernetes.io/docs/user-guide/compute-resources/](http://kubernetes.io/docs/user-guide/compute-resources/ + Resource object. Details are here server.retentionPeriod @@ -1561,7 +1588,7 @@ scrape_interval: 5m scrape_timeout: 30s - Scrape config for slow service endpoints; same as above, but with a larger timeout and a larger interval The relabeling allows the actual service scrape endpoint to be configured via the following annotations: * `prometheus.io/scrape-slow`: Only scrape services that have a value of `true` * `prometheus.io/scheme`: If the metrics endpoint is secured then you will need to set this to `https` & most likely set the `tls_config` of the scrape config. * `prometheus.io/path`: If the metrics path is not `/metrics` override this. * `prometheus.io/port`: If the metrics are exposed on a different port to the service then set this appropriately. + Scrape config for slow service endpoints; same as above, but with a larger timeout and a larger interval The relabeling allows the actual service scrape endpoint to be configured via the following annotations: server.scrape.config.scrape_configs[6] @@ -1597,7 +1624,7 @@ relabel_configs: target_label: service - Example scrape config for probing services via the Blackbox Exporter. The relabeling allows the actual service scrape endpoint to be configured via the following annotations: * `prometheus.io/probe`: Only probe services that have a value of `true` + Example scrape config for probing services via the Blackbox Exporter. The relabeling allows the actual service scrape endpoint to be configured via the following annotations: server.scrape.config.scrape_configs[7] @@ -1643,7 +1670,7 @@ relabel_configs: target_label: pod - Example scrape config for pods The relabeling allows the actual pod scrape endpoint to be configured via the following annotations: * `prometheus.io/scrape`: Only scrape pods that have a value of `true` * `prometheus.io/path`: If the metrics path is not `/metrics` override this. * `prometheus.io/port`: Scrape the pod on the indicated port instead of the default of `9102`. + Example scrape config for pods The relabeling allows the actual pod scrape endpoint to be configured via the following annotations: server.scrape.configMap @@ -1670,7 +1697,7 @@ false [] - Extra scrape configs that will be appended to `server.scrape.config` + Extra scrape configs that will be appended to server.scrape.config server.securityContext @@ -1706,7 +1733,7 @@ enabled: true [] - Service External IPs. Ref: [https://kubernetes.io/docs/user-guide/services/#external-ips]( https://kubernetes.io/docs/user-guide/services/#external-ips) + Service External IPs. Details are here server.service.labels @@ -1868,7 +1895,7 @@ OrderedReady [] - Node tolerations for server scheduling to nodes with taints. Ref: [https://kubernetes.io/docs/concepts/configuration/assign-pod-node/](https://kubernetes.io/docs/concepts/configuration/assign-pod-node/) + Node tolerations for server scheduling to nodes with taints. Details are here server.vmbackupmanager.destination @@ -2209,3 +2236,4 @@ true + diff --git a/charts/victoria-metrics-single/values.yaml b/charts/victoria-metrics-single/values.yaml index 2e023df8b..8a5fa8d71 100644 --- a/charts/victoria-metrics-single/values.yaml +++ b/charts/victoria-metrics-single/values.yaml @@ -30,7 +30,7 @@ serviceAccount: automountServiceAccountToken: true podDisruptionBudget: - # -- See `kubectl explain poddisruptionbudget.spec` for more. Ref: [https://kubernetes.io/docs/tasks/run-application/configure-pdb/](https://kubernetes.io/docs/tasks/run-application/configure-pdb/) + # -- See kubectl explain poddisruptionbudget.spec for more. Details are here enabled: false # minAvailable: 1 # maxUnavailable: 1 @@ -108,7 +108,7 @@ server: # - -src=s3://your_bucket/folder/latest # - -credsFilePath=/etc/vm/creds/credentials - # -- Node tolerations for server scheduling to nodes with taints. Ref: [https://kubernetes.io/docs/concepts/configuration/assign-pod-node/](https://kubernetes.io/docs/concepts/configuration/assign-pod-node/) + # -- Node tolerations for server scheduling to nodes with taints. Details are here tolerations: [] # - key: "key" @@ -116,7 +116,7 @@ server: # value: "value" # effect: "NoSchedule|PreferNoSchedule" - # -- Pod's node selector. Ref: [https://kubernetes.io/docs/user-guide/node-selection/](https://kubernetes.io/docs/user-guide/node-selection/) + # -- Pod's node selector. Details are here nodeSelector: {} # -- Pod affinity @@ -142,7 +142,7 @@ server: # -- Create/use Persistent Volume Claim for server component. Empty dir if false enabled: true - # -- Array of access modes. Must match those of existing PV or dynamic provisioner. Ref: [http://kubernetes.io/docs/user-guide/persistent-volumes/](http://kubernetes.io/docs/user-guide/persistent-volumes/) + # -- Array of access modes. Must match those of existing PV or dynamic provisioner. Details are here accessModes: - ReadWriteOnce # -- Persistant volume annotations @@ -173,7 +173,7 @@ server: # -- Pod's management policy podManagementPolicy: OrderedReady - # -- Resource object. Ref: [http://kubernetes.io/docs/user-guide/compute-resources/](http://kubernetes.io/docs/user-guide/compute-resources/ + # -- Resource object. Details are here resources: {} # limits: @@ -214,7 +214,7 @@ server: # -- Security context to be added to server pods securityContext: enabled: true - # -- Pod's security context. Ref: [https://kubernetes.io/docs/tasks/configure-pod-container/security-context/](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/) + # -- Pod's security context. Details are here podSecurityContext: enabled: true ingress: @@ -323,7 +323,7 @@ server: labels: {} # -- Service ClusterIP clusterIP: "" - # -- Service External IPs. Ref: [https://kubernetes.io/docs/user-guide/services/#external-ips]( https://kubernetes.io/docs/user-guide/services/#external-ips) + # -- Service External IPs. Details are here externalIPs: [] # -- Service load balacner IP loadBalancerIP: "" @@ -404,15 +404,15 @@ server: # -- Scrape config for API servers. # # Kubernetes exposes API servers as endpoints to the default/kubernetes - # service so this uses `endpoints` role and uses relabelling to only keep + # service so this uses endpoints role and uses relabelling to only keep # the endpoints associated with the default/kubernetes service using the - # default named port `https`. This works for single API server deployments as + # default named port https. This works for single API server deployments as # well as HA API server deployments. - job_name: "kubernetes-apiservers" kubernetes_sd_configs: - role: endpoints # Default to scraping over https. If required, just disable this or change to - # `http`. + # http. scheme: https # This TLS & bearer token file config is used to connect to the actual scrape # endpoints for cluster components. This is separate to discovery auth @@ -445,7 +445,7 @@ server: # -- Scrape rule using kubernetes service discovery for nodes - job_name: "kubernetes-nodes" # Default to scraping over https. If required, just disable this or change to - # `http`. + # http. scheme: https # This TLS & bearer token file config is used to connect to the actual scrape # endpoints for cluster components. This is separate to discovery auth @@ -477,7 +477,7 @@ server: # -- Scrape rule using kubernetes service discovery for cadvisor - job_name: "kubernetes-nodes-cadvisor" # Default to scraping over https. If required, just disable this or change to - # `http`. + # http. scheme: https # This TLS & bearer token file config is used to connect to the actual scrape # endpoints for cluster components. This is separate to discovery auth @@ -519,12 +519,14 @@ server: # The relabeling allows the actual service scrape endpoint to be configured # via the following annotations: # - # * `prometheus.io/scrape`: Only scrape services that have a value of `true` - # * `prometheus.io/scheme`: If the metrics endpoint is secured then you will need - # to set this to `https` & most likely set the `tls_config` of the scrape config. - # * `prometheus.io/path`: If the metrics path is not `/metrics` override this. - # * `prometheus.io/port`: If the metrics are exposed on a different port to the - # service then set this appropriately. + # # -- Scrape rule using kubernetes service discovery for endpoints - job_name: "kubernetes-service-endpoints" kubernetes_sd_configs: @@ -575,12 +577,14 @@ server: # The relabeling allows the actual service scrape endpoint to be configured # via the following annotations: # - # * `prometheus.io/scrape-slow`: Only scrape services that have a value of `true` - # * `prometheus.io/scheme`: If the metrics endpoint is secured then you will need - # to set this to `https` & most likely set the `tls_config` of the scrape config. - # * `prometheus.io/path`: If the metrics path is not `/metrics` override this. - # * `prometheus.io/port`: If the metrics are exposed on a different port to the - # service then set this appropriately. + # - job_name: "kubernetes-service-endpoints-slow" scrape_interval: 5m scrape_timeout: 30s @@ -631,7 +635,9 @@ server: # The relabeling allows the actual service scrape endpoint to be configured # via the following annotations: # - # * `prometheus.io/probe`: Only probe services that have a value of `true` + # - job_name: "kubernetes-services" metrics_path: /probe params: @@ -660,9 +666,11 @@ server: # The relabeling allows the actual pod scrape endpoint to be configured via the # following annotations: # - # * `prometheus.io/scrape`: Only scrape pods that have a value of `true` - # * `prometheus.io/path`: If the metrics path is not `/metrics` override this. - # * `prometheus.io/port`: Scrape the pod on the indicated port instead of the default of `9102`. + # - job_name: "kubernetes-pods" kubernetes_sd_configs: - role: pod @@ -695,7 +703,7 @@ server: target_label: pod ## End of COPY - # -- Extra scrape configs that will be appended to `server.scrape.config` + # -- Extra scrape configs that will be appended to server.scrape.config extraScrapeConfigs: [] # -- Add extra specs dynamically to this chart