updating enhancement

.dockerignore

@@ -6,4 +6,4 @@ build.sh
 .gitignore
 kubernetes/*
 venv/*
-config_*
+configd_*

.gitignore

@@ -10,4 +10,3 @@ venv/*
 *.log
 /config*.py
 /config*.ini
-.idea

Dockerfile

@@ -1,5 +1,5 @@
-FROM python:3.11.0a3
-LABEL maintainer="[email protected]"
+FROM python:3.11
+LABEL maintainer="[email protected]"
 LABEL Description="zabbix-kubernetes - efficent kubernetes monitoring for zabbix"
 
 MAINTAINER [email protected]
@@ -10,23 +10,23 @@ ENV ZABBIX_SERVER "zabbix"
 ENV ZABBIX_HOST "k8s"
 ENV CRYPTOGRAPHY_DONT_BUILD_RUST "1"
 
-COPY --chown=nobody:users requirements.txt /app/requirements.txt
+WORKDIR /app
+COPY --chown=nobody:users Pipfile  /app/
 
-RUN  apt-get update -y && \
-       apt-get install libffi-dev libffi7 libssl-dev bash screen ncdu -y && \
-       pip3 install --upgrade pip && \
-       pip3 install -r /app/requirements.txt && \
-       apt-get upgrade -y && \
-       apt-get dist-upgrade -y  && \
-       apt-get remove base libssl-dev libffi-dev gcc -y && \
-       apt-get autoremove -y && \
-       rm -rf /var/lib/apt/lists/* /root/.cache
+RUN  apt-get update -y
+RUN  apt-get upgrade -y
+RUN  apt-get dist-upgrade -y
+RUN  apt-get install libffi-dev libffi8 libssl-dev bash screen ncdu -y
+RUN  pip install --root-user-action=ignore --upgrade pip && pip install --root-user-action=ignore pipenv
+RUN  PIPENV_USE_SYSTEM=1 pipenv install --skip-lock --system
+RUN  apt-get remove base libssl-dev libffi-dev gcc -y
+RUN  apt-get autoremove -y
+RUN  rm -rf /var/lib/apt/lists/* /root/.cache
 
 COPY --chown=nobody:users base /app/base
 COPY --chown=nobody:users k8sobjects /app/k8sobjects
 COPY --chown=nobody:users check_kubernetesd /app/check_kubernetesd
+COPY --chown=nobody:users config_default.ini /app/config_default.ini
 
 USER nobody
-WORKDIR /app
-
 ENTRYPOINT [ "/app/check_kubernetesd" ]

Jenkinsfile

@@ -4,6 +4,7 @@ pipeline {
     agent any
     parameters {
         booleanParam(defaultValue: false, description: 'Create release', name: 'RELEASE')
+        string(name: 'REPO', defaultValue: '-', description: 'Repo for docker')
     }
 
     triggers {
@@ -24,15 +25,15 @@ pipeline {
             steps {
                ansiColor('xterm') {
                   sh 'git fetch --tags'
-                  sh './build.sh cleanup'
+                  sh "./build.sh cleanup ${params.TARGET}"
                }
             }
         }
         stage('Build and Test') {
             steps {
                 ansiColor('xterm') {
                   sh 'git fetch --tags'
-                  sh "./build.sh default vicoconsulting"
+                  sh "./build.sh default ${params.TARGET}"
                 }
             }
         }
@@ -42,7 +43,7 @@ pipeline {
             }
             steps {
                ansiColor('xterm') {
-                  sh './build.sh publish_image vicoconsulting'
+                  sh "./build.sh publish_image ${params.TARGET}"
                }
             }
         }

Pipfile

@@ -0,0 +1,22 @@
+[[source]]
+url = "https://pypi.org/simple"
+verify_ssl = true
+name = "pypi"
+
+[packages]
+kubernetes = "==21.7.0"
+cryptography = "==36.0.1"
+types-cryptography = "==3.3.10"
+py-zabbix = "==1.1.7"
+sentry-sdk = "==1.5.1"
+adal = "==1.2.7"
+urllib3 = "==1.26.7"
+pytest = "==6.2.5"
+mypy = "==0.930"
+flake8 = "==4.0.1"
+coloredlogs = "==15.0.1"
+
+[dev-packages]
+
+[requires]
+python_version = "3.11"

README.md

@@ -32,7 +32,7 @@ The solution currently supervises the following types of Kubernetes entities:
 
 For details or a overview of the monitored kubernetes attributes, have a look at the [documentation](http://htmlpreview.github.io/?https://github.com/zabbix-tooling/k8s-zabbix/blob/master/documentation/template/custom_service_kubernetes.html)
 
-The current docker image is published at https://hub.docker.com/repository/docker/scoopex666/k8s-zabbix/
+The current docker image is published at https://hub.docker.com/r/zabbixtooling/k8s-zabbix/
 
 Architecture Details
 =====================
@@ -141,6 +141,20 @@ Production Deployment
     * "Monitoring" →  "Latest data" →  "Add Hosts": i.e. "k8s-prod-001"
     * Enable Option "Show items without data" →  Button "Apply"
 
+Configuration
+=====================
+All Configuration Options are available through ENV Variables
+for a list of options check *config_default.py*
+
+  * K8S_CONFIG_TYPE
+    * incluster
+      * use default kubeconfig
+    * kubeconfig
+      * load kubeconfig file from current user
+    * token
+      * use token auth
+
+
 Unix Signals
 ============
 

base/config.py

@@ -19,7 +19,7 @@ class ClusterAccessConfigType(Enum):
     TOKEN = "token"
 
 
-logger = logging.getLogger(__file__)
+logger = logging.getLogger("k8s-zabbix")
 
 
 @dataclass(order=True)
@@ -38,6 +38,8 @@ class Configuration:
     sentry_enabled: bool = False
     sentry_dsn: str = ""
 
+    container_crawling: str = "container"
+
     zabbix_server: str = 'example.zabbix-server.com'
     zabbix_resources_exclude: list[str] = field(default_factory=lambda: [])
     zabbix_host: str = 'k8s-example-host'
@@ -59,6 +61,11 @@ class Configuration:
     discovery_interval_slow: int = 60 * 60 * 2
     resend_data_interval_slow: int = 60 * 30
 
+    discovery_interval_delay: int = 120
+    data_resend_interval_delay: int = 180
+
+    data_refresh_interval: int = 60 * 60 * 4
+
     def _convert_to_type(self, field_name: str,
                          value: str | list[str] | bool | int | ClusterAccessConfigType) -> \
             str | list[str] | bool | int | ClusterAccessConfigType: