Compare commits

...

2 Commits

Author SHA1 Message Date
Alex D. 6d64e91b1d
Renew letsencrypt 2023-07-27 08:41:20 +00:00
Alex D. 745b819e90
Move data from influx to prometheus 2023-07-16 13:29:17 +00:00
10 changed files with 42 additions and 30 deletions

View File

@ -40,6 +40,7 @@ Internal ports: 7500-7600
pgsql: 7582
unbound: 7583
HAProxy PROM: 7581
Telegraf PROM: 7584
Promtail: 7590
vtun: 7591

View File

@ -3,7 +3,7 @@
. ../APKBUILD-config.template
pkgver=2023.03.31.01
pkgver=2023.07.16.01
pkgrel=0
source="
config.yaml
@ -21,5 +21,5 @@ package() {
}
sha512sums="
246409e3a057f622fc28d800aabcf454d085226b7b462ae8760bed90a4aea9006a3418c8d93a3cf051fc1725383623bffec3a138d8e9fdaed88d0b403cddc056 config.yaml
ee030f047d7856819ce0558f391d8db6ca3c1430e85146094a40e25cbcab9a1f011b048b33a781355dbd63635e84797e50b2e984b7cd2a847f4b2f9335fb1fa3 config.yaml
"

View File

@ -18,6 +18,10 @@ scrape_configs:
dns_sd_configs:
- names: [ 'unbound.prometheus.routinginfo.internal' ]
type: 'SRV'
- job_name: "telegraf"
dns_sd_configs:
- names: [ 'telegraf.prometheus.routinginfo.internal' ]
type: 'SRV'
- job_name: "ceph"
dns_sd_configs:
- names: [ 'ceph.prometheus.routinginfo.internal' ]

View File

@ -3,7 +3,7 @@
. ../APKBUILD-config.template
pkgver=2022.03.01.01
pkgver=2023.07.16.01
pkgrel=0
options="" # Disables defaults, enabling checks
checkdepends="telegraf"
@ -103,7 +103,7 @@ _modinstall() {
sha512sums="
5a0f1dab5c4887700f7f29eeb0d1be28690737f1689a12e67861be4c0bb8276ece8fcb279983e6e3bc5484bd6aa932b663d6ff775c68e33c1190fcdbaa3b1889 main.conf
3f01fceee3333cb4f1723333d2e8f7c77e2cf2d2d5a6d7679ebcdb4edda23db22ebe1bd4eeec1a92a0245ef81b6a0849a4b9341fa66092ea82149100d189e037 secret
10c9ad1a614dd970c8ad4e7904c7be9439543c339f6bf5724be3bc8246b23dcedee1c3dfd534efb7eeb6c75571c9e00b22aae04536eae397b2447188c45552e4 base.conf
84c75c2c0a51726ec8c205bb94b827717bc10bee805fc171448c74d22269258da5cb64b6201703b2322eff4952ab7c191954618f56890f9e07e528f1242f858d base.conf
5a81b295f17189115fe93d1d68d94181aaab32dfcdd3e4d0480991c515d0cec57cb58bac354b893a5109a9e62d400a278489c9d64b997968ad8f326e02c7ddb1 unbound.conf
a4bc80850c94291d00b2ad56e50216ab36515bcc176b3c5678b24c3d5a3740b9de9006df8e37e42942a50227e6b27321d267e27decffbf6d9a37755d3224121e redis.conf
5d0aefde08abf5dedc01521a8b711d85bdfc7ff3cd6d8ac2176ae5c2914d8579fb7e3f4ede7ebff5989b2a196c8019b6869c2133375239643b1cdbadb5048ebf haproxy.conf

View File

@ -2,4 +2,7 @@
urls = ["http://influxdb.routinginfo.internal:7552"]
database = "telegraf"
[[outputs.prometheus_client]]
listen = ":7584"
[[inputs.system]]

View File

@ -3,7 +3,7 @@
. ../APKBUILD-data.template
pkgver=2023.07.05.01
pkgver=2023.07.27.01
pkgrel=0
checkdepends="bind-tools"
makedepends="
@ -69,6 +69,6 @@ internal() {
}
sha512sums="
53ac9f3005be9ace1d5369ab1ce2a9c0ecd88963d866d8b5a2715c79e9dc144f5b84da8fd753ca9a0188a038277838f5a644acbc5f9a3ca2a12b354a8547a6ba redxen.eu
1e6d18e587a7a7310d1666f215b1bd782c1e91d458f32e74cb1fdd5cedd3caeff300b1d36ad9eacc0dbd1f183fe393d8454fec31c425a3436726d7e9bd9d000a internal
b05989d0d1a320e2f14b52601fb9cde830af66d0bbb3a113d8298a93eae2d17530c31af6d4ba6272e007fe3ed68a19231d23f2f1d8d4168e7c73393f092a131b redxen.eu
6b55db1896d19bca987ed7979c190e406c46a5564d5e63fc984b8f3946ec7570b426fbc8eb18bd27af3123672ed49bba2055e49543bb0bea6ba54db268c68e05 internal
"

View File

@ -42,8 +42,13 @@ frontends.prometheus.routinginfo SRV 0 5 7581 12180621
SRV 0 5 7581 12180711.fsn1-dc14.hetzner
postgresql.prometheus.routinginfo SRV 0 5 7582 12180625.nbg1-dc3.hetzner
ceph.prometheus.routinginfo SRV 0 5 9283 0.tentacle.six
ceph.prometheus.routinginfo SRV 0 5 9283 1.tentacle.six
ceph.prometheus.routinginfo SRV 0 5 9283 2.tentacle.six
SRV 0 5 9283 1.tentacle.six
SRV 0 5 9283 2.tentacle.six
telegraf.prometheus.routinginfo SRV 0 5 7584 12180623.nbg1-dc3.hetzner
SRV 0 5 7584 12180621.nbg1-dc3.hetzner
SRV 0 5 7584 12180625.nbg1-dc3.hetzner
SRV 0 5 7584 12180710.fsn1-dc14.hetzner
SRV 0 5 7584 12180711.fsn1-dc14.hetzner
_grafana._tcp.routinginfo SRV 0 5 7577 12180621.nbg1-dc3.hetzner
SRV 0 5 7577 12180710.fsn1-dc14.hetzner
_gitea._tcp.routinginfo SRV 0 5 7570 12180711.fsn1-dc14.hetzner

View File

@ -91,8 +91,8 @@ imap CNAME 12180623.nbg1-dc
_DMARC TXT "v=DMARC1; p=quarantine; rua=mailto:postmaster@redxen.eu; ruf=mailto:postmaster@redxen.eu; fo=1; pct=100"
; ACME
_acme-challenge 300 TXT "o5XmJLpB9ZhkdcU89_YQyYqa06aB3ZB0T4n_9OhCJ5k"
_acme-challenge 300 TXT "jiFis3iTRECZXU1XmldIgPs5Y_o57JAknkllff9muXo"
_acme-challenge 300 TXT "oVQkzcupdDHBA_637WxT0RM80Ngw0kq6Nv9IP2NqZMM"
_acme-challenge 300 TXT "m03xrhE9ehye7bYeDTctp6DihqMPt4OS0Ga02wjPxkY"
; Autodiscovery
_mumble._tcp SRV 0 5 64738 12180623.nbg1-dc3.hetzner

View File

@ -3,7 +3,7 @@
. ../APKBUILD-secret.template
pkgver=2023.05.08.01
pkgver=2023.07.27.01
pkgrel=0
subpackages="$pkgname-private $pkgname-public $pkgname-full $pkgname-ca $pkgname-chain"
checkdepends="openssl"
@ -55,6 +55,6 @@ ca() {
sha512sums="
394eabb864e83c98d5986ccaee3098db0d4fcb3e7e8dc1bb3e940e8de1108deb8a88081bd0b4b84dbdf60d79978a0c40ece8a2e5db0e6af2f8f0336c2d527a2e private.key
f71d27718d4d787bf25ef8dd3f14e6db93676cbce30848e7612e4812a71b4a67076bf2052aae9af9c841d2a1a86ea90ba9d18c7acee587b57ec5a93ac2e0a565 public.pem
b238f607095827a61a857759545724ffb908ef602580ecc645075eb1d9bba0ad28191278cbcc927c66b0b50f9ec6e660688b680d08027859d98211434c10f165 public.pem
6193ff52acda2b57fcf8b4881e93bf451577b77068f5e027fd8ccb7cea1e283e084e97bc7c33056eabc46dc1af903e865919c9da2789f2ae644ec2993ac74e0a ca.pem
"

View File

@ -1,30 +1,29 @@
-----BEGIN CERTIFICATE-----
MIIFJTCCBA2gAwIBAgISBIByJoxAVqrTVv8V7ZQQu+TSMA0GCSqGSIb3DQEBCwUA
MIIE6zCCA9OgAwIBAgISAyroq1OJKXG3l88KMp3IY2o/MA0GCSqGSIb3DQEBCwUA
MDIxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MQswCQYDVQQD
EwJSMzAeFw0yMzA1MDgxMDU4MTlaFw0yMzA4MDYxMDU4MThaMBQxEjAQBgNVBAMT
EwJSMzAeFw0yMzA3MjcwNzMzMjRaFw0yMzEwMjUwNzMzMjNaMBQxEjAQBgNVBAMT
CXJlZHhlbi5ldTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANeD0yl2
aQaIK73GpBOA1JpdesESlCvjEw9g84uN8Yk4fG77wGcDZw1Ja4vrj9MBmzvnLMUe
j5mizZP2L3eIgx3KKsuIT4hClGSR/oeN0cL93RUYAwZqW1q8NBuAxu1QPhXn82ZK
8qLnlZGJQBvRy2rCAru26QjgeJHt7P9jdDpq0KolT3Nlt+gmO/oJJiZUcfvUWJ+K
D0cX7BQy+GFH4XSAWSMB1w+HhLaKUESaBfSvAuX6awUu1JfbJW0yUoG+We9/RuMI
44TDLGfVujmpRYgcOlJRBQiSXi/pMie1kdQqev0uFYRCSuM6QTkHlPYRrPXHPZks
vmqRDe1do7TgnFkCAwEAAaOCAlEwggJNMA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUE
vmqRDe1do7TgnFkCAwEAAaOCAhcwggITMA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUE
FjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwDAYDVR0TAQH/BAIwADAdBgNVHQ4EFgQU
PIwzPDkx1+DgEji18Q8rc+Y0dXAwHwYDVR0jBBgwFoAUFC6zF7dYVsuuUAlA5h+v
nYsUwsYwVQYIKwYBBQUHAQEESTBHMCEGCCsGAQUFBzABhhVodHRwOi8vcjMuby5s
ZW5jci5vcmcwIgYIKwYBBQUHMAKGFmh0dHA6Ly9yMy5pLmxlbmNyLm9yZy8wIQYD
VR0RBBowGIILKi5yZWR4ZW4uZXWCCXJlZHhlbi5ldTBMBgNVHSAERTBDMAgGBmeB
DAECATA3BgsrBgEEAYLfEwEBATAoMCYGCCsGAQUFBwIBFhpodHRwOi8vY3BzLmxl
dHNlbmNyeXB0Lm9yZzCCAQQGCisGAQQB1nkCBAIEgfUEgfIA8AB1AHoyjFTYty22
IOo44FIe6YQWcDIThU070ivBOlejUutSAAABh/s6ElQAAAQDAEYwRAIgWi4uf7JP
Odh1PvAXJe8dgLG7jHvQn3j9v9zeu/9OFCUCIDenjOsxgyqB/7ok7ptEHbVbtH+b
in4WnrddVYuxymbBAHcArfe++nz/EMiLnT2cHj4YarRnKV3PsQwkyoWGNOvcgooA
AAGH+zoSbwAABAMASDBGAiEA9JAhCzLDKTK6exwyTpJiZ/fJk6qrTKpS3e3sQkMD
9OsCIQDRVFi1axsrUAzcvVeWfW7W2R4iSt0F6VG9guyBMOkzejANBgkqhkiG9w0B
AQsFAAOCAQEAm4Xkv2CTLgyCq65Dzf7desENfiavtH8y6S7Ftc0PVj++kqhE7u7N
pl6cXixY9+lFziMPEPgJAu4k2WoyrkGjPGfBZwf0xFbT6yTGQTTTDGA2KS6GtX9g
9r1ew/ExlDy32lljpoYEY/kafSjCv1DEixRF91lwaNuwaI/mwKbbSPUcs/ZO0126
oi0uS1UFY6/XXMyV9rUUCP6YmHyaXFGIgOZR1B8pe8jebO8OVIj2E1bEvRMwD3LZ
CtwjOx/rFhfvJl8S7odI2eRvn/wVUml1Hy+sq4oKMIfIq8orsOhe7qrjzAQg9CWA
oDFRPjPkIfOBqd0VyqSqfvFx44IHm8W9vw==
VR0RBBowGIILKi5yZWR4ZW4uZXWCCXJlZHhlbi5ldTATBgNVHSAEDDAKMAgGBmeB
DAECATCCAQMGCisGAQQB1nkCBAIEgfQEgfEA7wB2AHoyjFTYty22IOo44FIe6YQW
cDIThU070ivBOlejUutSAAABiZZ7NcIAAAQDAEcwRQIhAPK4My1iA6WnHRY01fyo
GrcMVLpgOH+NUZ2Gh8BGVcWjAiBRSOIVj4tayJoRu9P4kvjLO0e/DChzayAI5eFL
VpxA1gB1AOg+0No+9QY1MudXKLyJa8kD08vREWvs62nhd31tBr1uAAABiZZ7NasA
AAQDAEYwRAIgItnDg5wciJP9Wfz8BJczQ1wsUuAL2ptceLF6H8ReWjYCICRoWuhj
Q1dnO4uvvPdbCyIonZj9DA1Dd95Gvekbufw8MA0GCSqGSIb3DQEBCwUAA4IBAQA1
MSzr3Llh01zwQQkCD06L4V9toiX1WuSsOri0TzFUwR3sIOeY+rijDPW3+xfymWrC
N7VxzhseiXQ8V6mdJ1cNhuSoAyKs1PTSS156HqZA8Q2oIhgZ18vJIOkCq4DJvoh+
pTDZYcKbseR1u2IcGkT32tR1tTpro3/5z8skKdcoWLDvVZIQMPszIoeeqOvoMtI8
WJtVD/0ggHZUQiJ8HMsATkkGpJ/bOM+pMupP6QddQyH1gHqiT68R5iqlVPSln3fU
tDFR/+vPQDhZS+z0GjPJHjxP9K/5T1NPwKSeK6fWEPP4MncuSYG9GZlIT9UPAK0u
A0/MZiYNtQP+b6RPZbzF
-----END CERTIFICATE-----