refactor(auth): remove Authentik SSO, restore basic auth and provision Node Exporter dashboard
ansible-core-mon / deploy (push) Successful in 25s
ansible-core-net / deploy (push) Failing after 25s
ansible-core-secrets / deploy (push) Successful in 12s
ansible-opnsense / deploy (push) Successful in 5s
ansible-rus-central / deploy (push) Successful in 37s
ansible-core-mon / deploy (push) Successful in 25s
ansible-core-net / deploy (push) Failing after 25s
ansible-core-secrets / deploy (push) Successful in 12s
ansible-opnsense / deploy (push) Successful in 5s
ansible-rus-central / deploy (push) Successful in 37s
This commit is contained in:
1 parent
94a143623b
commit
c0a9d7f0c8
16 files changed
+15682
-219
No files matched your search
@@ -33,6 +33,7 @@ TOKEN=$(infisical login \
|
|||||||
export INFISICAL_TOKEN="${TOKEN}"
|
export INFISICAL_TOKEN="${TOKEN}"
|
||||||
|
|
||||||
eval "$(infisical export --domain="${INFISICAL_DOMAIN}" --token="${TOKEN}" --env=prod --projectId="${INFISICAL_PROJECT_ID}" --path="/ci-cd" --format=dotenv-export --silent)"
|
eval "$(infisical export --domain="${INFISICAL_DOMAIN}" --token="${TOKEN}" --env=prod --projectId="${INFISICAL_PROJECT_ID}" --path="/ci-cd" --format=dotenv-export --silent)"
|
||||||
|
eval "$(infisical export --domain="${INFISICAL_DOMAIN}" --token="${TOKEN}" --env=prod --projectId="${INFISICAL_PROJECT_ID}" --path="/USER/ADMIN" --format=dotenv-export --silent 2>/dev/null || true)"
|
||||||
|
|
||||||
if [ -z "${RUNNER_SSH_KEY:-}" ]; then
|
if [ -z "${RUNNER_SSH_KEY:-}" ]; then
|
||||||
echo "В Infisical (/ci-cd) отсутствует RUNNER_SSH_KEY" >&2
|
echo "В Infisical (/ci-cd) отсутствует RUNNER_SSH_KEY" >&2
|
||||||
@@ -48,29 +49,12 @@ extra=()
|
|||||||
|
|
||||||
case "$machine" in
|
case "$machine" in
|
||||||
core-net)
|
core-net)
|
||||||
if ! infisical export --domain="${INFISICAL_DOMAIN}" --token="${TOKEN}" --env=prod --projectId="${INFISICAL_PROJECT_ID}" --path="/services/authentik" --format=dotenv-export --silent 2>/dev/null | grep -q 'AUTHENTIK_SECRET_KEY'; then
|
if [ -n "${ADMIN_USER:-}" ] && [ -n "${ADMIN_PASSWORD:-}" ]; then
|
||||||
infisical secrets-manager folders create authentik --path /services --env prod --projectId "${INFISICAL_PROJECT_ID}" --domain "${INFISICAL_DOMAIN}" --token "${TOKEN}" --silent 2>/dev/null || true
|
TRAEFIK_HASH=$(openssl passwd -apr1 -salt "$(openssl rand -hex 4)" "${ADMIN_PASSWORD}")
|
||||||
GEN_SECRET_KEY=$(openssl rand -base64 48 | tr -dc 'a-zA-Z0-9' | head -c 50)
|
export TRAEFIK_DASHBOARD_AUTH="${ADMIN_USER}:${TRAEFIK_HASH}"
|
||||||
GEN_PG_PASS=$(openssl rand -hex 20)
|
extra+=(-e "traefik_dashboard_auth=${TRAEFIK_DASHBOARD_AUTH}")
|
||||||
infisical secrets set --domain="${INFISICAL_DOMAIN}" --token="${TOKEN}" --env=prod --projectId="${INFISICAL_PROJECT_ID}" --path="/services/authentik" \
|
|
||||||
"AUTHENTIK_SECRET_KEY=${GEN_SECRET_KEY}" \
|
|
||||||
"AUTHENTIK_POSTGRES_PASSWORD=${GEN_PG_PASS}" \
|
|
||||||
--silent
|
|
||||||
unset GEN_SECRET_KEY GEN_PG_PASS
|
|
||||||
fi
|
fi
|
||||||
if ! infisical export --domain="${INFISICAL_DOMAIN}" --token="${TOKEN}" --env=prod --projectId="${INFISICAL_PROJECT_ID}" --path="/services/authentik" --format=dotenv-export --silent 2>/dev/null | grep -q 'GRAFANA_OAUTH_CLIENT_SECRET'; then
|
extra+=(-e "authentik_enabled=false")
|
||||||
infisical secrets-manager folders create authentik --path /services --env prod --projectId "${INFISICAL_PROJECT_ID}" --domain "${INFISICAL_DOMAIN}" --token "${TOKEN}" --silent 2>/dev/null || true
|
|
||||||
GEN_OAUTH_SECRET=$(openssl rand -base64 48 | tr -dc 'a-zA-Z0-9' | head -c 48)
|
|
||||||
infisical secrets set --domain="${INFISICAL_DOMAIN}" --token="${TOKEN}" --env=prod --projectId="${INFISICAL_PROJECT_ID}" --path="/services/authentik" \
|
|
||||||
"GRAFANA_OAUTH_CLIENT_SECRET=${GEN_OAUTH_SECRET}" \
|
|
||||||
--silent
|
|
||||||
unset GEN_OAUTH_SECRET
|
|
||||||
fi
|
|
||||||
eval "$(infisical export --domain="${INFISICAL_DOMAIN}" --token="${TOKEN}" --env=prod --projectId="${INFISICAL_PROJECT_ID}" --path="/services/authentik" --format=dotenv-export --silent)"
|
|
||||||
export AUTHENTIK_SECRET_KEY="${AUTHENTIK_SECRET_KEY:-}"
|
|
||||||
export AUTHENTIK_POSTGRES_PASSWORD="${AUTHENTIK_POSTGRES_PASSWORD:-}"
|
|
||||||
export GRAFANA_OAUTH_CLIENT_SECRET="${GRAFANA_OAUTH_CLIENT_SECRET:-}"
|
|
||||||
extra+=(-e "grafana_oauth_client_secret=${GRAFANA_OAUTH_CLIENT_SECRET:-}")
|
|
||||||
;;
|
;;
|
||||||
core-secrets)
|
core-secrets)
|
||||||
eval "$(infisical export --domain="${INFISICAL_DOMAIN}" --token="${TOKEN}" --env=prod --projectId="${INFISICAL_PROJECT_ID}" --path="/services/infisical" --format=dotenv-export --silent)"
|
eval "$(infisical export --domain="${INFISICAL_DOMAIN}" --token="${TOKEN}" --env=prod --projectId="${INFISICAL_PROJECT_ID}" --path="/services/infisical" --format=dotenv-export --silent)"
|
||||||
@@ -79,29 +63,15 @@ case "$machine" in
|
|||||||
export INFISICAL_AUTH_SECRET="${AUTH_SECRET}"
|
export INFISICAL_AUTH_SECRET="${AUTH_SECRET}"
|
||||||
;;
|
;;
|
||||||
core-mon)
|
core-mon)
|
||||||
if ! infisical export --domain="${INFISICAL_DOMAIN}" --token="${TOKEN}" --env=prod --projectId="${INFISICAL_PROJECT_ID}" --path="/services/monitoring" --format=dotenv-export --silent 2>/dev/null | grep -q 'GRAFANA_ADMIN_PASSWORD'; then
|
export GRAFANA_ADMIN_USER="${ADMIN_USER:-karpenok}"
|
||||||
infisical secrets-manager folders create monitoring --path /services --env prod --projectId "${INFISICAL_PROJECT_ID}" --domain "${INFISICAL_DOMAIN}" --token "${TOKEN}" --silent 2>/dev/null || true
|
export GRAFANA_ADMIN_PASSWORD="${ADMIN_PASSWORD:-}"
|
||||||
GEN_GRAFANA_PASS=$(openssl rand -base64 32 | tr -dc 'a-zA-Z0-9' | head -c 24)
|
export NTFY_ADMIN_USER="${ADMIN_USER:-karpenok}"
|
||||||
infisical secrets set --domain="${INFISICAL_DOMAIN}" --token="${TOKEN}" --env=prod --projectId="${INFISICAL_PROJECT_ID}" --path="/services/monitoring" \
|
export NTFY_ADMIN_PASSWORD="${ADMIN_PASSWORD:-}"
|
||||||
"GRAFANA_ADMIN_USER=admin" \
|
extra+=(-e "grafana_admin_user=${GRAFANA_ADMIN_USER}" -e "grafana_admin_password=${GRAFANA_ADMIN_PASSWORD}")
|
||||||
"GRAFANA_ADMIN_PASSWORD=${GEN_GRAFANA_PASS}" \
|
extra+=(-e "ntfy_admin_user=${NTFY_ADMIN_USER}" -e "ntfy_admin_password=${NTFY_ADMIN_PASSWORD}")
|
||||||
--silent
|
if [ -n "${MAIL_ADMIN_USER:-}" ]; then
|
||||||
unset GEN_GRAFANA_PASS
|
extra+=(-e "grafana_admin_email=${MAIL_ADMIN_USER}")
|
||||||
fi
|
fi
|
||||||
if ! infisical export --domain="${INFISICAL_DOMAIN}" --token="${TOKEN}" --env=prod --projectId="${INFISICAL_PROJECT_ID}" --path="/services/authentik" --format=dotenv-export --silent 2>/dev/null | grep -q 'GRAFANA_OAUTH_CLIENT_SECRET'; then
|
|
||||||
infisical secrets-manager folders create authentik --path /services --env prod --projectId "${INFISICAL_PROJECT_ID}" --domain "${INFISICAL_DOMAIN}" --token "${TOKEN}" --silent 2>/dev/null || true
|
|
||||||
GEN_OAUTH_SECRET=$(openssl rand -base64 48 | tr -dc 'a-zA-Z0-9' | head -c 48)
|
|
||||||
infisical secrets set --domain="${INFISICAL_DOMAIN}" --token="${TOKEN}" --env=prod --projectId="${INFISICAL_PROJECT_ID}" --path="/services/authentik" \
|
|
||||||
"GRAFANA_OAUTH_CLIENT_SECRET=${GEN_OAUTH_SECRET}" \
|
|
||||||
--silent
|
|
||||||
unset GEN_OAUTH_SECRET
|
|
||||||
fi
|
|
||||||
eval "$(infisical export --domain="${INFISICAL_DOMAIN}" --token="${TOKEN}" --env=prod --projectId="${INFISICAL_PROJECT_ID}" --path="/services/monitoring" --format=dotenv-export --silent)"
|
|
||||||
eval "$(infisical export --domain="${INFISICAL_DOMAIN}" --token="${TOKEN}" --env=prod --projectId="${INFISICAL_PROJECT_ID}" --path="/services/authentik" --format=dotenv-export --silent)"
|
|
||||||
export GRAFANA_ADMIN_USER="${GRAFANA_ADMIN_USER:-admin}"
|
|
||||||
export GRAFANA_ADMIN_PASSWORD="${GRAFANA_ADMIN_PASSWORD:-}"
|
|
||||||
export GRAFANA_OAUTH_CLIENT_SECRET="${GRAFANA_OAUTH_CLIENT_SECRET:-}"
|
|
||||||
extra+=(-e "grafana_oauth_client_secret=${GRAFANA_OAUTH_CLIENT_SECRET:-}")
|
|
||||||
;;
|
;;
|
||||||
rus-central)
|
rus-central)
|
||||||
input_email="${INPUT_LETSENCRYPT_EMAIL:-}"
|
input_email="${INPUT_LETSENCRYPT_EMAIL:-}"
|
||||||
|
|||||||
@@ -2,11 +2,12 @@
|
|||||||
monitoring_dir: /opt/monitoring
|
monitoring_dir: /opt/monitoring
|
||||||
prometheus_retention: "30d"
|
prometheus_retention: "30d"
|
||||||
|
|
||||||
grafana_admin_user: "{{ lookup('ansible.builtin.env', 'GRAFANA_ADMIN_USER', default='admin') }}"
|
grafana_admin_user: "{{ lookup('ansible.builtin.env', 'GRAFANA_ADMIN_USER', default='karpenok') }}"
|
||||||
grafana_admin_password: "{{ lookup('ansible.builtin.env', 'GRAFANA_ADMIN_PASSWORD', default='') }}"
|
grafana_admin_password: "{{ lookup('ansible.builtin.env', 'GRAFANA_ADMIN_PASSWORD', default='') }}"
|
||||||
|
grafana_admin_email: "{{ lookup('ansible.builtin.env', 'MAIL_ADMIN_USER', default=grafana_admin_user ~ '@gunihome.ru') }}"
|
||||||
grafana_root_url: "https://graf.gunihome.ru"
|
grafana_root_url: "https://graf.gunihome.ru"
|
||||||
grafana_oauth_client_secret: "{{ lookup('ansible.builtin.env', 'GRAFANA_OAUTH_CLIENT_SECRET', default='') }}"
|
|
||||||
|
|
||||||
ntfy_base_url: "https://ntfy.gunihome.ru"
|
ntfy_base_url: "https://ntfy.gunihome.ru"
|
||||||
ntfy_default_topic: "homelab-alerts"
|
ntfy_default_topic: "homelab-alerts"
|
||||||
|
ntfy_admin_user: "{{ lookup('ansible.builtin.env', 'NTFY_ADMIN_USER', default=grafana_admin_user) }}"
|
||||||
|
ntfy_admin_password: "{{ lookup('ansible.builtin.env', 'NTFY_ADMIN_PASSWORD', default=grafana_admin_password) }}"
|
||||||
File diff suppressed because it is too large.
Load diff
@@ -1,10 +1,4 @@
|
|||||||
---
|
---
|
||||||
- name: Проверить наличие секрета Grafana OAuth
|
|
||||||
ansible.builtin.assert:
|
|
||||||
that:
|
|
||||||
- grafana_oauth_client_secret is defined and grafana_oauth_client_secret | length > 0
|
|
||||||
fail_msg: "Секрет GRAFANA_OAUTH_CLIENT_SECRET не передан!"
|
|
||||||
|
|
||||||
- name: Создать базовые каталоги мониторинга
|
- name: Создать базовые каталоги мониторинга
|
||||||
ansible.builtin.file:
|
ansible.builtin.file:
|
||||||
path: "{{ item.path }}"
|
path: "{{ item.path }}"
|
||||||
@@ -22,6 +16,7 @@
|
|||||||
- { path: "{{ monitoring_dir }}/grafana_data", owner: "472", group: "472", mode: "0755" }
|
- { path: "{{ monitoring_dir }}/grafana_data", owner: "472", group: "472", mode: "0755" }
|
||||||
- { path: "{{ monitoring_dir }}/grafana/provisioning", owner: "root", group: "root", mode: "0755" }
|
- { path: "{{ monitoring_dir }}/grafana/provisioning", owner: "root", group: "root", mode: "0755" }
|
||||||
- { path: "{{ monitoring_dir }}/grafana/provisioning/datasources", owner: "root", group: "root", mode: "0755" }
|
- { path: "{{ monitoring_dir }}/grafana/provisioning/datasources", owner: "root", group: "root", mode: "0755" }
|
||||||
|
- { path: "{{ monitoring_dir }}/grafana/provisioning/dashboards", owner: "root", group: "root", mode: "0755" }
|
||||||
- { path: "{{ monitoring_dir }}/ntfy_data", owner: "root", group: "root", mode: "0777" }
|
- { path: "{{ monitoring_dir }}/ntfy_data", owner: "root", group: "root", mode: "0777" }
|
||||||
|
|
||||||
- name: Установить конфигурацию Prometheus
|
- name: Установить конфигурацию Prometheus
|
||||||
@@ -56,6 +51,22 @@
|
|||||||
group: root
|
group: root
|
||||||
mode: "0644"
|
mode: "0644"
|
||||||
|
|
||||||
|
- name: Установить провайдер дашбордов Grafana
|
||||||
|
ansible.builtin.template:
|
||||||
|
src: grafana-dashboards.yml.j2
|
||||||
|
dest: "{{ monitoring_dir }}/grafana/provisioning/dashboards/dashboards.yml"
|
||||||
|
owner: root
|
||||||
|
group: root
|
||||||
|
mode: "0644"
|
||||||
|
|
||||||
|
- name: Скопировать статические дашборды Grafana
|
||||||
|
ansible.builtin.copy:
|
||||||
|
src: dashboards/
|
||||||
|
dest: "{{ monitoring_dir }}/grafana/provisioning/dashboards/"
|
||||||
|
owner: root
|
||||||
|
group: root
|
||||||
|
mode: "0644"
|
||||||
|
|
||||||
- name: Установить compose.yaml для стека мониторинга
|
- name: Установить compose.yaml для стека мониторинга
|
||||||
ansible.builtin.template:
|
ansible.builtin.template:
|
||||||
src: compose.yaml.j2
|
src: compose.yaml.j2
|
||||||
@@ -69,6 +80,32 @@
|
|||||||
register: compose_up
|
register: compose_up
|
||||||
changed_when: "'Started' in compose_up.stderr or 'Created' in compose_up.stderr or 'Recreated' in compose_up.stderr or 'Pulled' in compose_up.stderr"
|
changed_when: "'Started' in compose_up.stderr or 'Created' in compose_up.stderr or 'Recreated' in compose_up.stderr or 'Pulled' in compose_up.stderr"
|
||||||
|
|
||||||
|
- name: Дождаться готовности Ntfy
|
||||||
|
ansible.builtin.uri:
|
||||||
|
url: "http://127.0.0.1:80/v1/health"
|
||||||
|
status_code: 200
|
||||||
|
register: ntfy_health
|
||||||
|
retries: 15
|
||||||
|
delay: 2
|
||||||
|
until: ntfy_health.status == 200
|
||||||
|
|
||||||
|
- name: Создать или обновить пользователя администратора в Ntfy
|
||||||
|
ansible.builtin.command: >
|
||||||
|
docker exec -i -e NTFY_PASSWORD="{{ ntfy_admin_password }}"
|
||||||
|
monitoring-ntfy ntfy user add --role=admin --ignore-exists "{{ ntfy_admin_user }}"
|
||||||
|
register: ntfy_user_add
|
||||||
|
changed_when: "'added' in ntfy_user_add.stdout or 'added' in ntfy_user_add.stderr"
|
||||||
|
failed_when: false
|
||||||
|
no_log: true
|
||||||
|
|
||||||
|
- name: Обновить пароль администратора в Ntfy
|
||||||
|
ansible.builtin.command: >
|
||||||
|
docker exec -i -e NTFY_PASSWORD="{{ ntfy_admin_password }}"
|
||||||
|
monitoring-ntfy ntfy user change-pass "{{ ntfy_admin_user }}"
|
||||||
|
changed_when: false
|
||||||
|
failed_when: false
|
||||||
|
no_log: true
|
||||||
|
|
||||||
- name: Дождаться готовности Grafana
|
- name: Дождаться готовности Grafana
|
||||||
ansible.builtin.uri:
|
ansible.builtin.uri:
|
||||||
url: "http://127.0.0.1:3000/api/health"
|
url: "http://127.0.0.1:3000/api/health"
|
||||||
@@ -78,11 +115,16 @@
|
|||||||
delay: 2
|
delay: 2
|
||||||
until: grafana_health.status == 200
|
until: grafana_health.status == 200
|
||||||
|
|
||||||
|
- name: Обеспечить имя и email администратора в базе Grafana
|
||||||
|
ansible.builtin.command: >
|
||||||
|
python3 -c "import sqlite3; conn = sqlite3.connect('{{ monitoring_dir }}/grafana_data/grafana.db'); conn.execute('UPDATE user SET login=\"{{ grafana_admin_user }}\", email=\"{{ grafana_admin_email }}\" WHERE id=1'); conn.commit()"
|
||||||
|
failed_when: false
|
||||||
|
changed_when: false
|
||||||
|
|
||||||
- name: Синхронизировать пароль администратора Grafana с Infisical
|
- name: Синхронизировать пароль администратора Grafana с Infisical
|
||||||
ansible.builtin.command:
|
ansible.builtin.command:
|
||||||
cmd: docker exec -i monitoring-grafana grafana cli admin reset-admin-password --password-from-stdin
|
cmd: docker exec -i monitoring-grafana grafana cli admin reset-admin-password --user-id 1 --password-from-stdin
|
||||||
stdin: "{{ grafana_admin_password }}"
|
stdin: "{{ grafana_admin_password }}"
|
||||||
no_log: true
|
no_log: true
|
||||||
changed_when: false
|
changed_when: false
|
||||||
when: grafana_admin_password is defined and grafana_admin_password | length > 0
|
when: grafana_admin_password is defined and grafana_admin_password | length > 0
|
||||||
|
|
||||||
@@ -13,4 +13,8 @@ receivers:
|
|||||||
webhook_configs:
|
webhook_configs:
|
||||||
- url: "http://ntfy:80/{{ ntfy_default_topic }}"
|
- url: "http://ntfy:80/{{ ntfy_default_topic }}"
|
||||||
send_resolved: true
|
send_resolved: true
|
||||||
|
http_config:
|
||||||
|
basic_auth:
|
||||||
|
username: "{{ ntfy_admin_user }}"
|
||||||
|
password: "{{ ntfy_admin_password }}"
|
||||||
|
|
||||||
@@ -41,6 +41,8 @@ services:
|
|||||||
environment:
|
environment:
|
||||||
- NTFY_BASE_URL={{ ntfy_base_url }}
|
- NTFY_BASE_URL={{ ntfy_base_url }}
|
||||||
- NTFY_BEHIND_PROXY=true
|
- NTFY_BEHIND_PROXY=true
|
||||||
|
- NTFY_AUTH_FILE=/var/cache/ntfy/auth.db
|
||||||
|
- NTFY_AUTH_DEFAULT_ACCESS=deny-all
|
||||||
- NTFY_CACHE_FILE=/var/cache/ntfy/cache.db
|
- NTFY_CACHE_FILE=/var/cache/ntfy/cache.db
|
||||||
- NTFY_ATTACHMENT_CACHE_DIR=/var/cache/ntfy/attachments
|
- NTFY_ATTACHMENT_CACHE_DIR=/var/cache/ntfy/attachments
|
||||||
volumes:
|
volumes:
|
||||||
@@ -57,21 +59,6 @@ services:
|
|||||||
- GF_SECURITY_ADMIN_PASSWORD={{ grafana_admin_password }}
|
- GF_SECURITY_ADMIN_PASSWORD={{ grafana_admin_password }}
|
||||||
- GF_USERS_ALLOW_SIGN_UP=false
|
- GF_USERS_ALLOW_SIGN_UP=false
|
||||||
- GF_SERVER_ROOT_URL={{ grafana_root_url }}
|
- GF_SERVER_ROOT_URL={{ grafana_root_url }}
|
||||||
- GF_AUTH_GENERIC_OAUTH_ENABLED=true
|
|
||||||
- GF_AUTH_GENERIC_OAUTH_NAME=Authentik
|
|
||||||
- GF_AUTH_GENERIC_OAUTH_CLIENT_ID=grafana
|
|
||||||
- GF_AUTH_GENERIC_OAUTH_CLIENT_SECRET={{ grafana_oauth_client_secret }}
|
|
||||||
- GF_AUTH_GENERIC_OAUTH_SCOPES=openid email profile
|
|
||||||
- GF_AUTH_GENERIC_OAUTH_AUTH_URL=https://auth.gunihome.ru/application/o/authorize/
|
|
||||||
- GF_AUTH_GENERIC_OAUTH_TOKEN_URL=https://auth.gunihome.ru/application/o/token/
|
|
||||||
- GF_AUTH_GENERIC_OAUTH_API_URL=https://auth.gunihome.ru/application/o/userinfo/
|
|
||||||
- GF_AUTH_GENERIC_OAUTH_ALLOW_SIGN_UP=true
|
|
||||||
- GF_AUTH_GENERIC_OAUTH_LOGIN_ATTRIBUTE_PATH=preferred_username
|
|
||||||
- GF_AUTH_GENERIC_OAUTH_NAME_ATTRIBUTE_PATH=name
|
|
||||||
- GF_AUTH_GENERIC_OAUTH_EMAIL_ATTRIBUTE_PATH=email
|
|
||||||
- GF_AUTH_GENERIC_OAUTH_USE_PKCE=true
|
|
||||||
- "GF_AUTH_GENERIC_OAUTH_ROLE_ATTRIBUTE_PATH=contains(groups[*], 'admins') && 'Admin' || 'Viewer'"
|
|
||||||
- GF_AUTH_GENERIC_OAUTH_ALLOW_ASSIGN_GRAFANA_ADMIN=true
|
|
||||||
volumes:
|
volumes:
|
||||||
- ./grafana_data:/var/lib/grafana
|
- ./grafana_data:/var/lib/grafana
|
||||||
- ./grafana/provisioning:/etc/grafana/provisioning:ro
|
- ./grafana/provisioning:/etc/grafana/provisioning:ro
|
||||||
|
|||||||
@@ -0,0 +1,11 @@
|
|||||||
|
apiVersion: 1
|
||||||
|
|
||||||
|
providers:
|
||||||
|
- name: 'default'
|
||||||
|
orgId: 1
|
||||||
|
folder: 'Homelab'
|
||||||
|
type: file
|
||||||
|
disableDeletion: false
|
||||||
|
editable: true
|
||||||
|
options:
|
||||||
|
path: /etc/grafana/provisioning/dashboards
|
||||||
@@ -2,6 +2,7 @@ apiVersion: 1
|
|||||||
|
|
||||||
datasources:
|
datasources:
|
||||||
- name: Prometheus
|
- name: Prometheus
|
||||||
|
uid: prometheus
|
||||||
type: prometheus
|
type: prometheus
|
||||||
access: proxy
|
access: proxy
|
||||||
url: http://prometheus:9090
|
url: http://prometheus:9090
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
---
|
---
|
||||||
authentik_version: "2024.12.3"
|
authentik_version: "2024.12.3"
|
||||||
authentik_dir: "/opt/authentik"
|
authentik_dir: "/opt/authentik"
|
||||||
|
authentik_enabled: false
|
||||||
authentik_http_port: 9000
|
authentik_http_port: 9000
|
||||||
authentik_secret_key: "{{ lookup('env', 'AUTHENTIK_SECRET_KEY') }}"
|
authentik_secret_key: "{{ lookup('env', 'AUTHENTIK_SECRET_KEY') }}"
|
||||||
authentik_postgres_password: "{{ lookup('env', 'AUTHENTIK_POSTGRES_PASSWORD') }}"
|
authentik_postgres_password: "{{ lookup('env', 'AUTHENTIK_POSTGRES_PASSWORD') }}"
|
||||||
grafana_oauth_client_secret: "{{ lookup('env', 'GRAFANA_OAUTH_CLIENT_SECRET') }}"
|
|
||||||
|
|
||||||
@@ -3,18 +3,13 @@ version: 1
|
|||||||
metadata:
|
metadata:
|
||||||
name: traefik-dashboard
|
name: traefik-dashboard
|
||||||
labels:
|
labels:
|
||||||
blueprints.goauthentik.io/description: "Панель Traefik и Ntfy Forward-auth"
|
blueprints.goauthentik.io/description: "Панель Traefik только для группы admins"
|
||||||
entries:
|
entries:
|
||||||
- model: authentik_core.group
|
- model: authentik_core.group
|
||||||
id: group-admins
|
id: group-admins
|
||||||
identifiers:
|
identifiers:
|
||||||
name: admins
|
name: admins
|
||||||
|
|
||||||
- model: authentik_core.group
|
|
||||||
id: group-family
|
|
||||||
identifiers:
|
|
||||||
name: family
|
|
||||||
|
|
||||||
- model: authentik_providers_proxy.proxyprovider
|
- model: authentik_providers_proxy.proxyprovider
|
||||||
id: provider-traefik-dashboard
|
id: provider-traefik-dashboard
|
||||||
identifiers:
|
identifiers:
|
||||||
@@ -42,43 +37,6 @@ entries:
|
|||||||
attrs:
|
attrs:
|
||||||
group: !KeyOf group-admins
|
group: !KeyOf group-admins
|
||||||
|
|
||||||
- model: authentik_providers_proxy.proxyprovider
|
|
||||||
id: provider-ntfy
|
|
||||||
identifiers:
|
|
||||||
name: ntfy
|
|
||||||
attrs:
|
|
||||||
mode: forward_single
|
|
||||||
external_host: https://ntfy.gunihome.ru
|
|
||||||
intercept_header_auth: true
|
|
||||||
authorization_flow: !Find [authentik_flows.flow, [slug, default-provider-authorization-implicit-consent]]
|
|
||||||
invalidation_flow: !Find [authentik_flows.flow, [slug, default-provider-invalidation-flow]]
|
|
||||||
|
|
||||||
- model: authentik_core.application
|
|
||||||
id: app-ntfy
|
|
||||||
identifiers:
|
|
||||||
slug: ntfy
|
|
||||||
attrs:
|
|
||||||
name: Ntfy
|
|
||||||
meta_launch_url: https://ntfy.gunihome.ru
|
|
||||||
policy_engine_mode: any
|
|
||||||
provider: !KeyOf provider-ntfy
|
|
||||||
|
|
||||||
- model: authentik_policies.policybinding
|
|
||||||
identifiers:
|
|
||||||
order: 0
|
|
||||||
target: !KeyOf app-ntfy
|
|
||||||
attrs:
|
|
||||||
group: !KeyOf group-admins
|
|
||||||
|
|
||||||
- model: authentik_policies.policybinding
|
|
||||||
identifiers:
|
|
||||||
order: 1
|
|
||||||
target: !KeyOf app-ntfy
|
|
||||||
attrs:
|
|
||||||
group: !KeyOf group-family
|
|
||||||
|
|
||||||
# providers ниже — полный список embedded outpost.
|
|
||||||
# Новый proxy-провайдер добавляется в этот файл, а не только в интерфейсе.
|
|
||||||
- model: authentik_outposts.outpost
|
- model: authentik_outposts.outpost
|
||||||
identifiers:
|
identifiers:
|
||||||
name: authentik Embedded Outpost
|
name: authentik Embedded Outpost
|
||||||
@@ -89,4 +47,3 @@ entries:
|
|||||||
authentik_host: https://auth.gunihome.ru
|
authentik_host: https://auth.gunihome.ru
|
||||||
providers:
|
providers:
|
||||||
- !KeyOf provider-traefik-dashboard
|
- !KeyOf provider-traefik-dashboard
|
||||||
- !KeyOf provider-ntfy
|
|
||||||
@@ -1,4 +1,22 @@
|
|||||||
---
|
---
|
||||||
|
- name: Остановить Authentik если сервис отключен
|
||||||
|
when: not authentik_enabled
|
||||||
|
block:
|
||||||
|
- name: Проверить наличие compose.yaml для Authentik
|
||||||
|
ansible.builtin.stat:
|
||||||
|
path: "{{ authentik_dir }}/compose.yaml"
|
||||||
|
register: authentik_compose_stat
|
||||||
|
|
||||||
|
- name: Остановить контейнеры Authentik
|
||||||
|
ansible.builtin.command: docker compose -f {{ authentik_dir }}/compose.yaml stop
|
||||||
|
when: authentik_compose_stat.stat.exists
|
||||||
|
register: compose_stop
|
||||||
|
changed_when: "'Stopping' in compose_stop.stderr or 'Stopped' in compose_stop.stderr"
|
||||||
|
failed_when: false
|
||||||
|
|
||||||
|
- name: Управление сервисом Authentik
|
||||||
|
when: authentik_enabled
|
||||||
|
block:
|
||||||
- name: Создать каталоги для сервиса Authentik с корректными правами
|
- name: Создать каталоги для сервиса Authentik с корректными правами
|
||||||
ansible.builtin.file:
|
ansible.builtin.file:
|
||||||
path: "{{ item.path }}"
|
path: "{{ item.path }}"
|
||||||
@@ -19,8 +37,7 @@
|
|||||||
that:
|
that:
|
||||||
- authentik_secret_key is defined and authentik_secret_key | length > 0
|
- authentik_secret_key is defined and authentik_secret_key | length > 0
|
||||||
- authentik_postgres_password is defined and authentik_postgres_password | length > 0
|
- authentik_postgres_password is defined and authentik_postgres_password | length > 0
|
||||||
- grafana_oauth_client_secret is defined and grafana_oauth_client_secret | length > 0
|
fail_msg: "Один или несколько секретов Authentik (AUTHENTIK_SECRET_KEY, AUTHENTIK_POSTGRES_PASSWORD) не переданы!"
|
||||||
fail_msg: "Один или несколько секретов Authentik (AUTHENTIK_SECRET_KEY, AUTHENTIK_POSTGRES_PASSWORD, GRAFANA_OAUTH_CLIENT_SECRET) не переданы!"
|
|
||||||
|
|
||||||
- name: Установить compose.yaml для Authentik
|
- name: Установить compose.yaml для Authentik
|
||||||
ansible.builtin.template:
|
ansible.builtin.template:
|
||||||
@@ -40,16 +57,6 @@
|
|||||||
mode: "0644"
|
mode: "0644"
|
||||||
register: authentik_blueprint
|
register: authentik_blueprint
|
||||||
|
|
||||||
- name: Установить шаблонные blueprints Authentik
|
|
||||||
ansible.builtin.template:
|
|
||||||
src: blueprints/grafana.yaml.j2
|
|
||||||
dest: "{{ authentik_dir }}/blueprints/grafana.yaml"
|
|
||||||
owner: root
|
|
||||||
group: root
|
|
||||||
mode: "0644"
|
|
||||||
register: authentik_blueprint_grafana
|
|
||||||
no_log: true
|
|
||||||
|
|
||||||
- name: Запустить сервисы Authentik через Docker Compose
|
- name: Запустить сервисы Authentik через Docker Compose
|
||||||
ansible.builtin.command: docker compose -f {{ authentik_dir }}/compose.yaml up -d --remove-orphans
|
ansible.builtin.command: docker compose -f {{ authentik_dir }}/compose.yaml up -d --remove-orphans
|
||||||
register: compose_up
|
register: compose_up
|
||||||
@@ -57,15 +64,12 @@
|
|||||||
|
|
||||||
- name: Перезапустить воркер Authentik при обновлении blueprints
|
- name: Перезапустить воркер Authentik при обновлении blueprints
|
||||||
ansible.builtin.command: docker compose -f {{ authentik_dir }}/compose.yaml restart authentik-worker
|
ansible.builtin.command: docker compose -f {{ authentik_dir }}/compose.yaml restart authentik-worker
|
||||||
when: (authentik_blueprint.changed or authentik_blueprint_grafana.changed) and not compose_up.changed
|
when: authentik_blueprint.changed and not compose_up.changed
|
||||||
|
|
||||||
- name: Применить blueprints Authentik в authentik-server
|
- name: Применить blueprints Authentik в authentik-server
|
||||||
ansible.builtin.command: >
|
ansible.builtin.command: >
|
||||||
docker compose -f {{ authentik_dir }}/compose.yaml exec -T authentik-server
|
docker compose -f {{ authentik_dir }}/compose.yaml exec -T authentik-server
|
||||||
ak apply_blueprint /blueprints/custom/traefik-dashboard.yaml /blueprints/custom/grafana.yaml
|
ak apply_blueprint /blueprints/custom/traefik-dashboard.yaml
|
||||||
when: authentik_blueprint.changed or authentik_blueprint_grafana.changed or compose_up.changed
|
when: authentik_blueprint.changed or compose_up.changed
|
||||||
register: apply_blueprints_cmd
|
register: apply_blueprints_cmd
|
||||||
changed_when: true
|
changed_when: true
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@@ -1,73 +0,0 @@
|
|||||||
# yaml-language-server: $schema=https://goauthentik.io/blueprints/schema.json
|
|
||||||
version: 1
|
|
||||||
metadata:
|
|
||||||
name: grafana-sso
|
|
||||||
labels:
|
|
||||||
blueprints.goauthentik.io/description: "Grafana OAuth2 Provider"
|
|
||||||
entries:
|
|
||||||
- model: authentik_core.group
|
|
||||||
id: group-admins
|
|
||||||
identifiers:
|
|
||||||
name: admins
|
|
||||||
|
|
||||||
- model: authentik_core.group
|
|
||||||
id: group-family
|
|
||||||
identifiers:
|
|
||||||
name: family
|
|
||||||
|
|
||||||
- model: authentik_providers_oauth2.scopemapping
|
|
||||||
id: scope-grafana-email
|
|
||||||
identifiers:
|
|
||||||
managed: homelab/providers/oauth2/scope-grafana-email
|
|
||||||
attrs:
|
|
||||||
name: "Grafana OAuth Mapping: OpenID 'email' with fallback"
|
|
||||||
scope_name: email
|
|
||||||
description: "Email scope with fallback for users without email"
|
|
||||||
expression: |
|
|
||||||
return {
|
|
||||||
"email": request.user.email or f"{request.user.username}@gunihome.ru",
|
|
||||||
"email_verified": True
|
|
||||||
}
|
|
||||||
|
|
||||||
- model: authentik_providers_oauth2.oauth2provider
|
|
||||||
id: provider-grafana
|
|
||||||
identifiers:
|
|
||||||
name: grafana
|
|
||||||
attrs:
|
|
||||||
client_type: confidential
|
|
||||||
client_id: grafana
|
|
||||||
client_secret: {{ grafana_oauth_client_secret | to_json }}
|
|
||||||
redirect_uris:
|
|
||||||
- matching_mode: strict
|
|
||||||
url: https://graf.gunihome.ru/login/generic_oauth
|
|
||||||
authorization_flow: !Find [authentik_flows.flow, [slug, default-provider-authorization-implicit-consent]]
|
|
||||||
invalidation_flow: !Find [authentik_flows.flow, [slug, default-provider-invalidation-flow]]
|
|
||||||
signing_key: !Find [authentik_crypto.certificatekeypair, [name, "authentik Self-signed Certificate"]]
|
|
||||||
property_mappings:
|
|
||||||
- !Find [authentik_providers_oauth2.scopemapping, [scope_name, openid]]
|
|
||||||
- !KeyOf scope-grafana-email
|
|
||||||
- !Find [authentik_providers_oauth2.scopemapping, [scope_name, profile]]
|
|
||||||
|
|
||||||
- model: authentik_core.application
|
|
||||||
id: app-grafana
|
|
||||||
identifiers:
|
|
||||||
slug: grafana
|
|
||||||
attrs:
|
|
||||||
name: Grafana
|
|
||||||
meta_launch_url: https://graf.gunihome.ru
|
|
||||||
policy_engine_mode: any
|
|
||||||
provider: !KeyOf provider-grafana
|
|
||||||
|
|
||||||
- model: authentik_policies.policybinding
|
|
||||||
identifiers:
|
|
||||||
order: 0
|
|
||||||
target: !KeyOf app-grafana
|
|
||||||
attrs:
|
|
||||||
group: !KeyOf group-admins
|
|
||||||
|
|
||||||
- model: authentik_policies.policybinding
|
|
||||||
identifiers:
|
|
||||||
order: 1
|
|
||||||
target: !KeyOf app-grafana
|
|
||||||
attrs:
|
|
||||||
group: !KeyOf group-family
|
|
||||||
@@ -4,3 +4,4 @@ traefik_dir: "/opt/traefik"
|
|||||||
traefik_dynamic_dir: "/opt/traefik/dynamic"
|
traefik_dynamic_dir: "/opt/traefik/dynamic"
|
||||||
traefik_log_dir: "/var/log/traefik"
|
traefik_log_dir: "/var/log/traefik"
|
||||||
traefik_acme_email: "{{ letsencrypt_email }}"
|
traefik_acme_email: "{{ letsencrypt_email }}"
|
||||||
|
traefik_dashboard_auth: "{{ lookup('ansible.builtin.env', 'TRAEFIK_DASHBOARD_AUTH', default='') }}"
|
||||||
@@ -5,17 +5,6 @@ http:
|
|||||||
entryPoints:
|
entryPoints:
|
||||||
- websecure
|
- websecure
|
||||||
service: ntfy
|
service: ntfy
|
||||||
middlewares:
|
|
||||||
- authentik@file
|
|
||||||
tls:
|
|
||||||
certResolver: letsencrypt
|
|
||||||
|
|
||||||
ntfy-outpost:
|
|
||||||
rule: "Host(`ntfy.gunihome.ru`) && PathPrefix(`/outpost.goauthentik.io/`)"
|
|
||||||
entryPoints:
|
|
||||||
- websecure
|
|
||||||
service: authentik@file
|
|
||||||
priority: 100
|
|
||||||
tls:
|
tls:
|
||||||
certResolver: letsencrypt
|
certResolver: letsencrypt
|
||||||
|
|
||||||
|
|||||||
@@ -46,6 +46,15 @@
|
|||||||
group: root
|
group: root
|
||||||
mode: "0644"
|
mode: "0644"
|
||||||
|
|
||||||
|
- name: Установить конфигурацию Traefik Dashboard с BasicAuth
|
||||||
|
ansible.builtin.template:
|
||||||
|
src: dynamic/dashboard.yml.j2
|
||||||
|
dest: "{{ traefik_dynamic_dir }}/dashboard.yml"
|
||||||
|
owner: root
|
||||||
|
group: root
|
||||||
|
mode: "0644"
|
||||||
|
when: traefik_dashboard_auth is defined and traefik_dashboard_auth | length > 0
|
||||||
|
|
||||||
- name: Найти существующие файлы маршрутов на сервере
|
- name: Найти существующие файлы маршрутов на сервере
|
||||||
ansible.builtin.find:
|
ansible.builtin.find:
|
||||||
paths: "{{ traefik_dynamic_dir }}"
|
paths: "{{ traefik_dynamic_dir }}"
|
||||||
@@ -58,7 +67,7 @@
|
|||||||
state: absent
|
state: absent
|
||||||
loop: "{{ remote_dynamic_files.files }}"
|
loop: "{{ remote_dynamic_files.files }}"
|
||||||
vars:
|
vars:
|
||||||
repo_files: "{{ q('fileglob', role_path ~ '/files/dynamic/*.yml') | map('basename') | list }}"
|
repo_files: "{{ (q('fileglob', role_path ~ '/files/dynamic/*.yml') | map('basename') | list) + ['dashboard.yml'] }}"
|
||||||
when: item.path | basename not in repo_files
|
when: item.path | basename not in repo_files
|
||||||
|
|
||||||
- name: Запустить Traefik через Docker Compose
|
- name: Запустить Traefik через Docker Compose
|
||||||
|
|||||||
+6
-1
@@ -6,7 +6,12 @@ http:
|
|||||||
- websecure
|
- websecure
|
||||||
service: api@internal
|
service: api@internal
|
||||||
middlewares:
|
middlewares:
|
||||||
- authentik@file
|
- dashboard-auth
|
||||||
tls:
|
tls:
|
||||||
certResolver: letsencrypt
|
certResolver: letsencrypt
|
||||||
|
|
||||||
|
middlewares:
|
||||||
|
dashboard-auth:
|
||||||
|
basicAuth:
|
||||||
|
users:
|
||||||
|
- "{{ traefik_dashboard_auth }}"
|
||||||
Reference in new issue
Block a user