diff --git a/charts/k8spacket/Chart.yaml b/charts/k8spacket/Chart.yaml index 07f2243..54170dc 100644 --- a/charts/k8spacket/Chart.yaml +++ b/charts/k8spacket/Chart.yaml @@ -5,5 +5,5 @@ description: A Helm chart for k8spacket tool maintainers: - name: k8spacket email: k8spacket@gmail.com -version: 2.0.0 +version: 2.0.1 appVersion: 2.0.0 diff --git a/charts/k8spacket/templates/NOTES.txt b/charts/k8spacket/templates/NOTES.txt index 43d852e..312e2c8 100644 --- a/charts/k8spacket/templates/NOTES.txt +++ b/charts/k8spacket/templates/NOTES.txt @@ -1,4 +1,2 @@ -1. Get the application URL by running these commands: - export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "k8spacket.fullname" . }}) - export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}") - echo http://$NODE_IP:$NODE_PORT +Installation completed. +See https://k8spacket.github.io/k8spacket/#installation, to check how to configure Grafana to use k8spacket. \ No newline at end of file diff --git a/charts/k8spacket/templates/daemonset.yaml b/charts/k8spacket/templates/daemonset.yaml index 4fec9c7..82384fe 100644 --- a/charts/k8spacket/templates/daemonset.yaml +++ b/charts/k8spacket/templates/daemonset.yaml @@ -74,12 +74,10 @@ spec: env: - name: K8S_PACKET_NAME_LABEL_VALUE value: {{ include "k8spacket.name" . }} - - name: K8S_PACKET_HIDE_SRC_PORT - value: {{ .Values.k8sPacket.metrics.hideSourcePort | quote }} - name: K8S_PACKET_REVERSE_GEOIP2_DB_PATH - value: {{ .Values.k8sPacket.metrics.reverseLookup.geoipDBPath }} + value: {{ .Values.k8sPacket.reverseLookup.geoipDBPath }} - name: K8S_PACKET_REVERSE_WHOIS_REGEXP - value: {{ .Values.k8sPacket.metrics.reverseLookup.whoisRegexp }} + value: {{ .Values.k8sPacket.reverseLookup.whoisRegexp }} - name: K8S_PACKET_TCP_LISTENER_PORT value: {{ .Values.k8sPacket.tcp.listener.port | quote }} - name: K8S_PACKET_TCP_LISTENER_INTERFACES_COMMAND @@ -88,8 +86,14 @@ spec: value: {{ .Values.k8sPacket.tcp.listener.interfaces.refreshPeriod }} - name: K8S_PACKET_TCP_PERSISTENT_DURATION value: {{ .Values.k8sPacket.tcp.connection.persistentDuration }} + - name: K8S_PACKET_TCP_METRICS_ENABLED + value: {{ .Values.k8sPacket.tcp.metrics.enabled | quote }} + - name: K8S_PACKET_TCP_METRICS_HIDE_SRC_PORT + value: {{ .Values.k8sPacket.tcp.metrics.hideSourcePort | quote }} - name: K8S_PACKET_TLS_CERTIFICATE_CACHE_TTL value: {{ .Values.k8sPacket.tls.certificate.cache.ttl }} + - name: K8S_PACKET_TLS_METRICS_ENABLED + value: {{ .Values.k8sPacket.tls.metrics.enabled | quote }} volumeMounts: - mountPath: /home/k8spacket/plugins name: plugins diff --git a/charts/k8spacket/values.yaml b/charts/k8spacket/values.yaml index 24a9ad1..b415b5d 100644 --- a/charts/k8spacket/values.yaml +++ b/charts/k8spacket/values.yaml @@ -56,17 +56,14 @@ tolerations: [] k8sPacket: ## Available plugin releases. Custom plugins can be provided plugins: - - https://github.com/k8spacket/plugins/releases/download/v2.0.0/nodegraph-$(arch).so - - https://github.com/k8spacket/plugins/releases/download/v2.0.0/tls-parser-$(arch).so - metrics: - ## Hide source port when 'true' (set to string value 'dynamic' instead of decimal real source port) for Prometheus metrics cardinality reasons - hideSourcePort: true - reverseLookup: - ## Reverse lookup db file based on GeoLite2 Free Geolocation Data - ## See: https://dev.maxmind.com/geoip/geolite2-free-geolocation-data?lang=en - geoipDBPath: "/home/k8spacket/GeoLite2-City.mmdb" - ## Whois result match regexp - whoisRegexp: "(?:OrgName:|org-name:)\\s*(.*)" + - https://github.com/k8spacket/plugins/releases/download/v2.0.1/nodegraph-$(arch).so + - https://github.com/k8spacket/plugins/releases/download/v2.0.1/tls-parser-$(arch).so + reverseLookup: + ## Reverse lookup db file based on GeoLite2 Free Geolocation Data + ## See: https://dev.maxmind.com/geoip/geolite2-free-geolocation-data?lang=en + geoipDBPath: "/home/k8spacket/GeoLite2-City.mmdb" + ## Whois result match regexp + whoisRegexp: "(?:OrgName:|org-name:)\\s*(.*)" tcp: connection: ## When a connection is treated as persistent @@ -78,8 +75,16 @@ k8sPacket: command: "ip address | grep @ | sed -E 's/.* (\\w+)@.*/\\1/' | tr '\\n' ',' | sed 's/.$//'" ## How often refresh the list of network interfaces to listen refreshPeriod: "10s" + metrics: + ## Enabled/disabled exposing TCP Prometheus metrics + enabled: true + ## Hide source port when 'true' (set to string value 'dynamic' instead of decimal real source port) for Prometheus metrics cardinality reasons + hideSourcePort: true tls: certificate: cache: ## How long scraped TLS certificates are stored in a cache - ttl: "24h" \ No newline at end of file + ttl: "24h" + metrics: + ## Enabled/disabled exposing TLS Prometheus metrics + enabled: true \ No newline at end of file