diff --git a/applications.yml b/applications.yml deleted file mode 100644 index 7915307..0000000 --- a/applications.yml +++ /dev/null @@ -1,13 +0,0 @@ -# Playbook Application Install ---- -- name: Haproxy Control LB - hosts: - - kubernetes_control_lb - roles: - - role: haproxy_control_lb - tags: - - haproxy - - haproxy_control_lb - - role: backup_talos - tags: - - backup_talos diff --git a/playbook.yml b/playbook.yml index d52fc15..9f8acec 100644 --- a/playbook.yml +++ b/playbook.yml @@ -9,17 +9,14 @@ tags: - hostbill -- name: Include playbook os - ansible.builtin.import_playbook: os.yml - tags: - - os - - loadbalancer - -- name: Include playbook applications - ansible.builtin.import_playbook: applications.yml - tags: - - applications - - loadbalancer +- name: Haproxy Control LB + hosts: + - kubernetes_control_lb + roles: + - role: haproxy_control_lb + tags: + - haproxy + - haproxy_control_lb - name: Include playbook talos ansible.builtin.import_playbook: talos.yml @@ -31,3 +28,11 @@ tags: - k8s_services - services + +- name: Backup Talos + hosts: + - kubernetes_control_lb + roles: + - role: backup_talos + tags: + - backup_talos diff --git a/roles/k8s_zabbix_proxy/tasks/main.yml b/roles/k8s_zabbix_proxy/tasks/main.yml index dfeb3cf..d120dfc 100644 --- a/roles/k8s_zabbix_proxy/tasks/main.yml +++ b/roles/k8s_zabbix_proxy/tasks/main.yml @@ -13,6 +13,27 @@ pod-security.kubernetes.io/enforce: privileged pod-security.kubernetes.io/warn: privileged +- name: Helm add Prometheus repo + delegate_to: "{{ kubectl_host }}" + run_once: true + kubernetes.core.helm_repository: + name: rometheus-community + repo_url: "https://prometheus-community.github.io/helm-charts" + +- name: Helm deploy KubeStateMetrics + delegate_to: "{{ kubectl_host }}" + kubernetes.core.helm: + kubeconfig: "{{ kubeconfig }}" + chart_ref: rometheus-community/kube-state-metrics + release_name: kube-state-metrics + release_namespace: monitoring + create_namespace: false + # version: "5.7.*" + wait: true + timeout: "30m" + # values: + # https://github.com/prometheus-community/helm-charts/blob/main/charts/kube-state-metrics/values.yaml + - name: Helm add Zabbix 6.0 repo delegate_to: "{{ kubectl_host }}" run_once: true @@ -35,6 +56,8 @@ # https://git.zabbix.com/projects/ZT/repos/kubernetes-helm/browse?at=refs%2Fheads%2Frelease%2F6.0#:~:text=GNU%20GPL%20v2-,Configuration,-The%20following%20table # Zabbix templates: https://git.zabbix.com/projects/ZBX/repos/zabbix/browse/templates/app/kubernetes_http?at=release%2F6.0 zabbixProxy: + image: + tag: ubuntu-6.0-latest env: - name: ZBX_HOSTNAME value: "zabbix-proxy.{{ cluster_name }}"