grafana: add Grafana on monitoring02 with Kanidm OIDC
Some checks failed
Run nix flake check / flake-check (push) Has been cancelled
Some checks failed
Run nix flake check / flake-check (push) Has been cancelled
Deploy Grafana test instance on monitoring02 with: - Kanidm OIDC authentication (admins -> Admin role, others -> Viewer) - Declarative datasources for Prometheus and Loki on monitoring01 - Local Caddy for TLS termination via internal ACME CA - DNS CNAME grafana-test.home.2rjus.net Terraform changes add OAuth2 client secret and AppRole policies for kanidm01 and monitoring02. Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
This commit is contained in:
@@ -18,6 +18,9 @@
|
|||||||
tier = "test"; # Start in test tier, move to prod after validation
|
tier = "test"; # Start in test tier, move to prod after validation
|
||||||
};
|
};
|
||||||
|
|
||||||
|
# DNS CNAME for Grafana test instance
|
||||||
|
homelab.dns.cnames = [ "grafana-test" ];
|
||||||
|
|
||||||
# Enable Vault integration
|
# Enable Vault integration
|
||||||
vault.enable = true;
|
vault.enable = true;
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
{ ... }: {
|
{ ... }: {
|
||||||
imports = [
|
imports = [
|
||||||
./configuration.nix
|
./configuration.nix
|
||||||
|
../../services/grafana
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
93
services/grafana/default.nix
Normal file
93
services/grafana/default.nix
Normal file
@@ -0,0 +1,93 @@
|
|||||||
|
{ config, pkgs, ... }:
|
||||||
|
{
|
||||||
|
services.grafana = {
|
||||||
|
enable = true;
|
||||||
|
settings = {
|
||||||
|
server = {
|
||||||
|
http_addr = "127.0.0.1";
|
||||||
|
http_port = 3000;
|
||||||
|
domain = "grafana-test.home.2rjus.net";
|
||||||
|
root_url = "https://grafana-test.home.2rjus.net/";
|
||||||
|
};
|
||||||
|
|
||||||
|
# Disable anonymous access
|
||||||
|
"auth.anonymous".enabled = false;
|
||||||
|
|
||||||
|
# OIDC authentication via Kanidm
|
||||||
|
"auth.generic_oauth" = {
|
||||||
|
enabled = true;
|
||||||
|
name = "Kanidm";
|
||||||
|
client_id = "grafana";
|
||||||
|
client_secret = "$__file{/run/secrets/grafana-oauth2}";
|
||||||
|
auth_url = "https://auth.home.2rjus.net/ui/oauth2";
|
||||||
|
token_url = "https://auth.home.2rjus.net/oauth2/token";
|
||||||
|
api_url = "https://auth.home.2rjus.net/oauth2/openid/grafana/userinfo";
|
||||||
|
scopes = "openid profile email groups";
|
||||||
|
# Map admins group to Admin role, everyone else to Viewer
|
||||||
|
role_attribute_path = "contains(groups[*], 'admins') && 'Admin' || 'Viewer'";
|
||||||
|
allow_sign_up = true;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
# Declarative datasources pointing to monitoring01
|
||||||
|
provision.datasources.settings = {
|
||||||
|
apiVersion = 1;
|
||||||
|
datasources = [
|
||||||
|
{
|
||||||
|
name = "Prometheus";
|
||||||
|
type = "prometheus";
|
||||||
|
url = "http://monitoring01.home.2rjus.net:9090";
|
||||||
|
isDefault = true;
|
||||||
|
uid = "prometheus";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name = "Loki";
|
||||||
|
type = "loki";
|
||||||
|
url = "http://monitoring01.home.2rjus.net:3100";
|
||||||
|
uid = "loki";
|
||||||
|
}
|
||||||
|
];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
# Vault secret for OAuth2 client secret
|
||||||
|
vault.secrets.grafana-oauth2 = {
|
||||||
|
secretPath = "services/grafana/oauth2-client-secret";
|
||||||
|
extractKey = "password";
|
||||||
|
services = [ "grafana" ];
|
||||||
|
owner = "grafana";
|
||||||
|
group = "grafana";
|
||||||
|
};
|
||||||
|
|
||||||
|
# Local Caddy for TLS termination
|
||||||
|
services.caddy = {
|
||||||
|
enable = true;
|
||||||
|
package = pkgs.unstable.caddy;
|
||||||
|
configFile = pkgs.writeText "Caddyfile" ''
|
||||||
|
{
|
||||||
|
acme_ca https://vault.home.2rjus.net:8200/v1/pki_int/acme/directory
|
||||||
|
metrics
|
||||||
|
}
|
||||||
|
|
||||||
|
grafana-test.home.2rjus.net {
|
||||||
|
log {
|
||||||
|
output file /var/log/caddy/grafana.log {
|
||||||
|
mode 644
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
reverse_proxy http://127.0.0.1:3000
|
||||||
|
}
|
||||||
|
|
||||||
|
http://${config.networking.hostName}.home.2rjus.net/metrics {
|
||||||
|
metrics
|
||||||
|
}
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
|
# Expose Caddy metrics for Prometheus
|
||||||
|
homelab.monitoring.scrapeTargets = [{
|
||||||
|
job_name = "caddy";
|
||||||
|
port = 80;
|
||||||
|
}];
|
||||||
|
}
|
||||||
@@ -30,6 +30,16 @@
|
|||||||
};
|
};
|
||||||
|
|
||||||
# Regular users (persons) are managed imperatively via kanidm CLI
|
# Regular users (persons) are managed imperatively via kanidm CLI
|
||||||
|
|
||||||
|
# OAuth2/OIDC clients for service authentication
|
||||||
|
systems.oauth2.grafana = {
|
||||||
|
displayName = "Grafana";
|
||||||
|
originUrl = "https://grafana-test.home.2rjus.net/login/generic_oauth";
|
||||||
|
originLanding = "https://grafana-test.home.2rjus.net/";
|
||||||
|
basicSecretFile = config.vault.secrets.grafana-oauth2.outputDir;
|
||||||
|
preferShortUsername = true;
|
||||||
|
scopeMaps.users = [ "openid" "profile" "email" "groups" ];
|
||||||
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -53,6 +63,15 @@
|
|||||||
group = "kanidm";
|
group = "kanidm";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
# Vault secret for Grafana OAuth2 client secret
|
||||||
|
vault.secrets.grafana-oauth2 = {
|
||||||
|
secretPath = "services/grafana/oauth2-client-secret";
|
||||||
|
extractKey = "password";
|
||||||
|
services = [ "kanidm" ];
|
||||||
|
owner = "kanidm";
|
||||||
|
group = "kanidm";
|
||||||
|
};
|
||||||
|
|
||||||
# Note: Kanidm does not expose Prometheus metrics
|
# Note: Kanidm does not expose Prometheus metrics
|
||||||
# If metrics support is added in the future, uncomment:
|
# If metrics support is added in the future, uncomment:
|
||||||
# homelab.monitoring.scrapeTargets = [
|
# homelab.monitoring.scrapeTargets = [
|
||||||
|
|||||||
@@ -89,6 +89,23 @@ locals {
|
|||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|
||||||
|
# kanidm01: Kanidm identity provider
|
||||||
|
"kanidm01" = {
|
||||||
|
paths = [
|
||||||
|
"secret/data/hosts/kanidm01/*",
|
||||||
|
"secret/data/kanidm/*",
|
||||||
|
"secret/data/services/grafana/*",
|
||||||
|
]
|
||||||
|
}
|
||||||
|
|
||||||
|
# monitoring02: Grafana test instance
|
||||||
|
"monitoring02" = {
|
||||||
|
paths = [
|
||||||
|
"secret/data/hosts/monitoring02/*",
|
||||||
|
"secret/data/services/grafana/*",
|
||||||
|
]
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -108,6 +108,12 @@ locals {
|
|||||||
auto_generate = true
|
auto_generate = true
|
||||||
password_length = 32
|
password_length = 32
|
||||||
}
|
}
|
||||||
|
|
||||||
|
# Grafana OAuth2 client secret (for Kanidm OIDC)
|
||||||
|
"services/grafana/oauth2-client-secret" = {
|
||||||
|
auto_generate = true
|
||||||
|
password_length = 64
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user