Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

monitoring stuff #241

Merged
merged 3 commits into from
Nov 2, 2024
Merged

monitoring stuff #241

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1e5b313
update
DO1JLR Nov 1, 2024
d221b10
Update submodules
DO1JLR Nov 1, 2024
f6b4e4a
update pretix.l3d.ch monitoring
DO1JLR Nov 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion collections/ansible_collections/ansible/posix
Open in desktop
Submodule posix updated 3 files
+3 −0 changelogs/fragments/584_firewalld_opt_type.yml
+8 −24 plugins/modules/firewalld.py
+0 −57 tests/integration/targets/firewalld/tasks/masquerade_test_cases.yml
2 changes: 1 addition & 1 deletion collections/ansible_collections/community/general
Open in desktop
Submodule general updated 8 files
+2 −0 changelogs/fragments/9047-redfish-uri-parsing.yml
+3 −0 changelogs/fragments/9067-gio-mime-version.yml
+2 −0 changelogs/fragments/9084-collection_version-importlib.yml
+1 −1 plugins/lookup/collection_version.py
+1 −0 plugins/module_utils/gio_mime.py
+8 −8 plugins/module_utils/redfish_utils.py
+9 −0 plugins/modules/gio_mime.py
+16 −1 tests/unit/plugins/modules/test_gio_mime.yaml
2 changes: 1 addition & 1 deletion collections/ansible_collections/community/grafana
Open in desktop
Submodule grafana updated 4 files
+2 −2 .github/workflows/ansible-test.yml
+1 −1 README.md
+3 −0 changelogs/fragments/406-python3.12.yml
+2 −2 tests/unit/modules/grafana/grafana_silence/test_grafana_silence.py
2 changes: 1 addition & 1 deletion collections/ansible_collections/l3d/pretix
Open in desktop
Submodule pretix updated 9 files
+76 −2 README.md
+23 −2 roles/nodejs/README.md
+24 −6 roles/postgres/README.md
+34 −6 roles/pretix/README.md
+1 −1 roles/pretix/defaults/main.yml
+20 −0 roles/pretix/handlers/main.yml
+11 −1 roles/pretix/tasks/systemd.yml
+1 −1 roles/pretix/vars/main.yml
+24 −3 roles/redis/README.md
2 changes: 1 addition & 1 deletion collections/ansible_collections/prometheus/prometheus
Open in desktop
Submodule prometheus updated 55 files
+6 −6 .config/molecule/config.yml
+14 −0 CHANGELOG.rst
+1 −1 changelogs/.plugin-cache.yaml
+77 −65 changelogs/changelog.yaml
+1 −1 galaxy.yml
+3 −0 roles/_common/meta/argument_specs.yml
+1 −1 roles/_common/tasks/install.yml
+11 −0 roles/_common/tasks/preflight.yml
+1 −0 roles/_common/vars/main.yml
+2 −10 roles/alertmanager/tasks/preflight.yml
+2 −10 roles/bind_exporter/tasks/preflight.yml
+1 −10 roles/blackbox_exporter/tasks/preflight.yml
+2 −10 roles/chrony_exporter/tasks/preflight.yml
+2 −10 roles/fail2ban_exporter/tasks/preflight.yml
+3 −14 roles/influxdb_exporter/tasks/preflight.yml
+1 −10 roles/ipmi_exporter/tasks/preflight.yml
+2 −10 roles/memcached_exporter/tasks/preflight.yml
+2 −10 roles/mongodb_exporter/tasks/preflight.yml
+2 −10 roles/mysqld_exporter/tasks/preflight.yml
+2 −10 roles/nginx_exporter/tasks/preflight.yml
+2 −10 roles/node_exporter/tasks/preflight.yml
+54 −0 roles/nvidia_gpu_exporter/README.md
+16 −0 roles/nvidia_gpu_exporter/defaults/main.yml
+10 −0 roles/nvidia_gpu_exporter/handlers/main.yml
+46 −0 roles/nvidia_gpu_exporter/meta/argument_specs.yml
+25 −0 roles/nvidia_gpu_exporter/meta/main.yml
+14 −0 roles/nvidia_gpu_exporter/molecule/alternative/molecule.yml
+33 −0 roles/nvidia_gpu_exporter/molecule/alternative/tests/test_alternative.py
+6 −0 roles/nvidia_gpu_exporter/molecule/default/molecule.yml
+66 −0 roles/nvidia_gpu_exporter/molecule/default/tests/test_default.py
+6 −0 roles/nvidia_gpu_exporter/molecule/latest/molecule.yml
+41 −0 roles/nvidia_gpu_exporter/molecule/latest/tests/test_latest.py
+69 −0 roles/nvidia_gpu_exporter/tasks/main.yml
+23 −0 roles/nvidia_gpu_exporter/tasks/preflight.yml
+45 −0 roles/nvidia_gpu_exporter/templates/nvidia_gpu_exporter.service.j2
+9 −0 roles/nvidia_gpu_exporter/vars/main.yml
+2 −10 roles/postgres_exporter/tasks/preflight.yml
+2 −5 roles/process_exporter/tasks/preflight.yml
+2 −1 roles/prometheus/defaults/main.yml
+5 −4 roles/prometheus/meta/argument_specs.yml
+1 −1 roles/prometheus/molecule/alternative/tests/test_alternative.py
+1 −1 roles/prometheus/molecule/default/tests/test_default.py
+7 −2 roles/prometheus/tasks/configure.yml
+13 −10 roles/prometheus/tasks/preflight.yml
+0 −0 roles/prometheus/templates/ansible_managed.yml.j2
+2 −0 roles/prometheus/templates/prometheus.yml.j2
+2 −10 roles/pushgateway/tasks/preflight.yml
+2 −10 roles/redis_exporter/tasks/preflight.yml
+2 −10 roles/smartctl_exporter/tasks/preflight.yml
+2 −10 roles/smokeping_prober/tasks/preflight.yml
+2 −10 roles/snmp_exporter/tasks/preflight.yml
+2 −10 roles/systemd_exporter/tasks/preflight.yml
+4 −0 tests/integration/targets/molecule-nvidia_gpu_exporter-alternative/runme.sh
+4 −0 tests/integration/targets/molecule-nvidia_gpu_exporter-default/runme.sh
+4 −0 tests/integration/targets/molecule-nvidia_gpu_exporter-latest/runme.sh
6 changes: 4 additions & 2 deletions host_vars/pretix.l3d.ch/vars.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,15 @@
# pretix
pretix__name: 'Patches'
pretix__address: 'https://patch.l3d.ch'
pretix__web_workers: '6'

# nginx
acme_domain_unwant_list:
- name: 'patch.l3d.space'
acme_domain_unwant_list: []

nginx_sites:
- name: 'patch.l3d.ch'
- name: 'node-exporter.pretix.l3d.ch'
- name: 'nginx-exporter.pretix.l3d.ch'

acme_notification_email: "{{ _acme_notification_email }}"

Expand Down
223 changes: 114 additions & 109 deletions host_vars/services.l3d.ch/vault.yml
View file
Open in desktop

Large diffs are not rendered by default.

182 changes: 93 additions & 89 deletions host_vars/services.l3d.space/vault.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,90 +1,94 @@
$ANSIBLE_VAULT;1.1;AES256
37363663376530626135313236316461366463303730383161656434356631343230313939643965
3161373965316564646462383061373239383162623639340a636335303761313262626630306233
63363337313232323465646330313134376134626434376538393661343430636335346261306361
3266393932376464660a616663306438626530383830373465393139336435376665356363663364
66623464353633636133353538313465653338333036326364363335336130303730303662356438
39396333323737613065333662656562653436303561356366623363396138613434623635663534
31356139306236626666326638396430333763396539616538373039383231363539353235633865
37323836353266646364313033366165363934316335626666343831656262326362336437656534
39633463633437303033623462393130633832303533353536323065353232323538613965626335
37323731366665396134633835663434363137666363636132626661303732333733383766343737
64366131363433626132333665663665366434326330376661313165316166653339393834376562
61393737653135653762643531376163663065633632336562356635313463623839343034313564
64623864663333623736333362363463363066636566633364366161313639376465613562313935
35366133663133326463303939633630656538383530346433646537303066363232626538313439
64613233333438623232396435333239323865613433336265623630373035623235393130656232
64383234616266323233636435393334383032336638623162346565303535396336616639346434
39613861343664393763653932316430653337643131333133393461346339663735653662636463
34613762653730393931656530383661303761356166376430393261303862303333663135313832
64633831316263333661653063613162613134626634383632376466383230313038313866353864
33306533343663626132366134376163633231373165323531366365613131656535386662323061
33376530333862373136623935383030623164643639356364363663623332653365393564376234
66306635663866323337666432313537643138313234366661383064333435376239316138326438
62383663313861313962656635326336363064663230303633363836326666346461303864336639
37356331333332663739346237383861636230383138613136356133623461386137646361646530
35393730326135663834333334346436323563376138336531376531373036336138373130613138
66656163643737306132326666613033616263646662653864656263326465366237373830633333
37303838646438306661626331626430623663613565353463643863383839366430393265396131
61323638626263326539386332383037366533386164313339633866633439663039373362626431
39383666636434373537393636393763366338306230336130363063343862373536386431336339
30633162626566383663356666303330623334653337343931346437626434623764346233623061
64626461333938363533643266643965663835393534376661373531616532363832363763613039
65396663353734346166356666393964326664666531623534326632363334376634373862646364
36623333646565306237376165623034653132643334626630363964343633623030326361393233
66313838306364396365373735366230376466626534663461383137616439643533353566343662
35313734333463336135353562623231303164303365633535396563383934666230623064393861
66303934323164656532383766643063386264633630343165636434373836656439666638323832
65626637313264643631623531643332333330316234663236323664623266633038393765353234
35376538316565316164633238346362356238316231343666323134663062396333313630363935
39383331613134326139303165306332323761366535353361303762313632643934303938303862
30663262383264333237373535396464656438353037663539333233613532623262326462666338
63323865656334386163383364656237666431626336633265656231323837386464323061353266
61373262666566306262313235623163666438336532343265303062333635303661623261333766
62313230643766356161333336313666323333303033366366316662363733663930653066323734
66643466653761396333343631373762663461353533303638316661646637646566633332616136
63393461383730336230653938646430613133623166643939623764656633613663363731383466
31616534316131616131353532666664303661386331396437376362333031316230393064303863
30613536643661393063633431376638663663373335636432376133303036386633356461643630
30363665653636356165303436613662313031623837636538646530623139303635366364663930
61386630663733653165373863666364373635333163356464626535343239343864336239393962
34383835393165343031356431613634623731343938643664396231356264323934346365386130
62366333383038656366393937633061376631363562353161373632623536666466633866633661
31353564636264653966383761396237643464313264626437303434303935373635323530363066
66653937363066616234313930373161346637343763393038643435313363643766376539626163
65643933623461366136666663313633653764386538666537323439393330386530663062373939
36333562646132643431616337353263663739623330363836316133366431613834363631336436
61326530636433393534343736613533643536363537376235343832336531613536306561333937
63653835633266353031646263303434643266626236356133326435623230653161633130636238
63313637393136623039343536616335363461353131326435666635306161613933396532666338
35643731366335633539636563653337383739303631636635323435303934623335633662633636
35353162386332343135646434383934653861343939333661373161313430366164373963393834
62636533656134376130626664613835623866616664323736636361646463303939343633336534
37393339303531373339313231336133386361663064616232383832643436376538633436303836
33393231313763333331353434623864353138613437393435386230666562313632643434326462
62646564323762333632656532623535623461363331353435636363633565363734326362373238
66643266393732333830613231646135616239623231353431316335666633633231613236646537
66326238383338616463373365613261376263373539666534653964313566353666393163323338
62643662616538363663663930633737383530323761326431363239346166373334613962386337
38393739373538373239616465623166366334386438386639623939353936623866383938323462
38613037393732323364376333633131636666366537303937303739363865376437366136323931
61393932656164343934393062616136353730323463313239346232343862663165343662366335
32353831373331316264323561343834643463613430303336626632346466653631663030656237
65333838626130303734386166623666303038613663326436393364373533656535626238386166
33633263313235323731356533303538323030373539393337633038613766643938393334636262
65643630336334323039333730363930313262623433626136646139333835613066663834383236
35656435376138616162306664383436623439636165626465356231633534366631626230333462
33613263396233326661383030633635363530636237376336383135613163376233326133346465
37383461353761623537636262316638653363363939343965663832636261303238316234303734
33653239623762636166616264393864393665623834363565383432373962363731383331646262
64316230346261333766613562353365633061356138636162623639343537613866326639323334
31386161633635623833643565663638653130313134633866373434633263373861306139376661
66613330336532333666643866313366623865623333363765626431313336363263643962393066
62323362353238666666373934633465663862656432323064316238353336303363626631656138
64393835356639363535336362333063316330336536356535343435663630353537366332613733
39393731363034383066303939393831636334663465306630623839663162646465373663623139
30663637336134643365666665633834353133376464636663313739366536393165386665393337
66386532616238306538306530396430363834636336663965643238366162373164373736623330
65356437333537333638376264623461363966633438343135343631393035663931306366666434
66393333316365356663353666343637653032343565396664383837666363303763646239633762
3731
61313662303364303539393465653633303032396134313363323430386433353936363161383531
3032336630363665353833613637373630653230346438340a376538393431616538346666376561
33343637653563393662393034616435323862653765303030306436303465313530343039643766
3531613834643366330a666266353935346439316435346564373563613735636232646132353734
65623163323939626437313531376238313264666335333065653335363862333764323066636439
66663231646438373832396264323538376230376532646438656637663836323432623831646561
63313730636264323766386237353730386136363135313163643932396462663130666562663530
64393831656432663337336133663238666431363338373665613536376531343334346632313063
32613736363934643361646564363338393133303366366231383966353036663334323664313334
33613466363431313962613961313065346538396631333835396461323035326638323736643734
38346662343433613735363561613130316131346465656664636364366436313233383631653434
34653065663562336431323663663335363239383135373636373637626563656465326433323531
32346132396665633363363532396137613537623864363930343935393161626133653065656464
64376538323539656533613766646364666639396533353530303739366137633631666465393162
66346263306435353462343837386332336634633065326166393735386439663438626561393533
65646264356437626665623165653739313434646331313764373666303536343231333065356637
37663338643164363161376566393931343032323736303737333564303934336663353638336265
65303030386533396439613366306139386262373566373932396161343933313631656562353666
31633366333761313063616132303065313438353435396163306533313361393762646435616335
37323538626637313332336261313139383036303539373530326464373762303365373061633736
30303639646233316635393463633537376237643836383134643862646666623362623938356432
64383832343333373662616430666566383033316135626563323966366238626134343730653135
32633663646262373836616232393730633335316564353036643938393736303330323230303264
64343931656233363534653135323664623430653231663866656662363935653461373638313962
36373461313231643637613237643734633336393336356261343835636262373634623937306634
63636239303632653631623335326263353061323363636334613335386330666235393232626138
38636438383131656438346537373332356633633932633462313563643262636464643465623861
66393136633135366533376537663032613237383566366333363933326430333132346230656236
33366264393530396236663634383637343063343836616236653366356638653138636638326436
32376664373066646634343965373638633837323930353436613238353235663537353538343262
65373434343731356264623439653233326536303230616138313462386239353362623531313165
39363935646232616336333262353030613632663431396534613064623036313465353362383034
31333234363861353135316635636136323364373132663066636432666233346438326639646461
33343635303638393061323866353263366232643737633733633936333663383936643638633633
36656263346564326265356166336364356238353332363663626334313464623537636362383430
33303363666362356238313164633566313035666161303962323665303862333832393934333539
31313830316238343365333334616238636533363035303230386666396365646334633831313866
66623264336634643332353761343030613638323162306664306661643338323133663637656132
31303765363739353034633230383664306562373633343265343964366337393364303234383933
35313164323761353564366363353130343638333438313831333461366433343030353063623837
66386237363539353939373764353762616435656365623865343363643765336364393734343433
62333938636232613739396663363935323766656238643463333136666632636562323137373134
37616465393331663639326364306239343536626564326331666234666463613336623430383235
66633732373831363464366465343166663665653364653966383531363261303439663863646538
65386136326231323565323536333233383439643463643762613436633733653731666531653362
63316138313935633766633332303039643066653264373031353838363639356436343137656361
39323538636533646661386631343732376535656236303166623538386364396565383362393730
37663266333237613031306566636562346134653734306363643630323262633438663235313336
35663166303066303932366162616130356661656264613665303534363761366136626161653263
61306666306436356465306637636633363165343839636532656330383330613537346430333137
66393861343161623032356637633066386639336365626135646539313238663064616131373563
37623237333936393261643230393664326163636663333165626665613533326232636263633837
66386361336461626330353239353732313032616366363164656561363234613538653638376564
62626666316438323862373234366437623365313831383430366135623530336566376532343463
66316532383233333062356230313836643337666163656362333233333931653464346430393831
66303837393362646264653939326236663565313333306566323666663735663235323265393634
62343063626634366638383835633638666665363538353732616232333662313332333938633537
34363339316661383534346535626138306461316262303465353264383366653966343538643362
65363033653261623735633335303337336661646162323865663136326230366136383035363836
34623235393431313230313066633634636339313736653563643035383534396536633737343662
32376632363863376433353435633634333262303964303965663062663733396436643534666565
38613137653837386165333661396135313664653532393931333632646331663365303064313965
63306162643163323131343237623832663632616138393538373164333638656432333162626266
37393034323232633065383037396366633262666431663163373366306466643431323136346665
38333165366563326437653038663434333533386365363462303637306566316437616137343664
65376531386130613636393862393334613266623936353266313162643262353339333266323530
38633362333233346161663064393736313766323935623936646363346364623633363361663464
62376139353739346434633661646637323465316338393632343361366531366634643832653564
63323862353565326339333435653337356337333838396433643734313832383033646465373836
63363032393834353537613563656533353838363435363934613264643330303533613433323865
64636664393864656531613762636635356630623237663961303539653165623261313664366639
62396361326637643065623733313332623664336637383738666436653464613664666262393034
66656135346565366462343337613164316536363063336139383161656330346134373262306432
37623637663931323236643934643761303035626266336432633939316436316635636236393363
30653165363064353563336135356632383638653637636132343463386539393034383166366462
31336261313164383137383765636366643336343534626434323637356663303261373666326333
35373532373661636237316538386231396634393736653634313132376233653336663134653438
35353134346635323062656533626331346436343735636531383633386635663539643539633337
33373939656163323736663230383835646532336364626135363937626639623932323265663338
63643161646163636362666134613935663538613638393132356561616331663965303639383739
31326533666462656131323233646339323630646631386139316239353761616136353731363037
37363066623361363034363963386638303033356262643666353135663562336530313663636562
33343533633561666536663865326362303332343439626563616336363138343034333438386436
64633362343033623866343038346531373464326238366564393934333865376166303534376631
36626432323264623362373235376131393439383731616264376138366231323232336162306535
31303264346336333734383838363538646632663532306638663234346330343631303464306264
37636537633539653833313433353763646331333066303039356432353464376664396636333261
35366366316631636362333434643231333766653966333665613334653838656134666139323936
32333731666238383033623939376431313037626630646362643265336336393636643162646564
33373230636530646632656233316463616461333265636534666235613037643337663432653132
63663661613961353232346639346337343439346563386331323733306565633763353535343530
66343461383030383437623562623965623731613361376338393732333935613635653562643539
6137
2 changes: 1 addition & 1 deletion site.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
- {role: l3d.nginx_exporter, tags: [monitoring, nginx, prometheus, exporter]}

- name: Deploy web config
hosts: web
hosts: web01.l3d.space
roles:
# - {role: geerlingguy.mysql, tags: [web, git, mysql], become: true}
- {role: l3d.git.gitea, tags: [web, gitea, git]}
Expand Down
25 changes: 25 additions & 0 deletions templates/files/nginx/sites/nginx-exporter.pretix.l3d.ch_tls.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
server {
listen 443 ssl http2;
listen [::]:443 ssl http2;

server_name nginx-exporter.pretix.l3d.ch;

include snippets/tls_parameters_{{ site.name }}.snippet.conf;
include snippets/tls_certificate_{{ site.name }}.snippet.conf;
include snippets/logging_{{ site.name }}.snippet.conf;


location / {
charset utf-8;
proxy_pass http://localhost:9113;
proxy_read_timeout 3600;
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;
allow 127.0.0.1; # allow requests from localhost
allow ::1; # allow requests from localhost
{% for address in prometheus_addr %}
allow {{ address }}; # allow prometheus Address
{% endfor %}
deny all; # deny all other hosts
}
}
38 changes: 38 additions & 0 deletions templates/files/nginx/sites/node-exporter.pretix.l3d.ch_tls.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
server {
listen 443 ssl http2;
listen [::]:443 ssl http2;

server_name node-exporter.pretix.l3d.ch;

include snippets/tls_parameters_{{ site.name }}.snippet.conf;
include snippets/tls_certificate_{{ site.name }}.snippet.conf;
include snippets/logging_{{ site.name }}.snippet.conf;


location / {
charset utf-8;
proxy_pass http://localhost:9100;
client_max_body_size 256M;
proxy_read_timeout 3600;
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;
allow 127.0.0.1; # allow requests from localhost
allow ::1; # allow requests from localhost
{% for address in prometheus_addr %}
allow {{ address }}; # allow prometheus Address
{% endfor %}
deny all; # deny all other hosts
}
location /nginx_status {
stub_status;
allow 127.0.0.1; # allow requests from localhost
allow ::1; # allow requests from localhost
{% for ipv4 in ansible_all_ipv4_addresses %}
allow {{ ipv4 }}; # allow local ipv4 address
{% endfor %}
{% for ipv6 in ansible_all_ipv6_addresses %}
allow {{ ipv6 }}; # allow local ipv6 address
{% endfor %}
deny all; # deny all other hosts
}
}
2 changes: 2 additions & 0 deletions templates/files/nginx/sites/patch.l3d.ch_tls.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ server {
include snippets/tls_certificate_{{ site.name }}.snippet.conf;
include snippets/logging_{{ site.name }}.snippet.conf;

rewrite ^/$ https://patch.l3d.ch/THW/patch/ redirect;

location / {
proxy_pass http://localhost:8345;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
Expand Down