From f2c4e3e21e8ce90f56165f1ba6fdbb832c239f4f Mon Sep 17 00:00:00 2001 From: L3D Date: Sat, 25 Nov 2023 02:11:38 +0100 Subject: [PATCH] node exporter adjusted --- collections/ansible_collections/ansible/posix | 2 +- .../ansible_collections/community/crypto | 2 +- .../ansible_collections/community/general | 2 +- host_vars/mail01.l3d.space/vars.yml | 10 +- host_vars/services.l3d.space/vars.yml | 9 +- host_vars/services.l3d.space/vault.yml | 132 +++++++++--------- host_vars/web01.l3d.space/vars.yml | 9 +- site.yml | 2 +- ...> node-exporter.mail01.l3d.space_tls.conf} | 2 +- ...node-exporter.services.l3d.space_tls.conf} | 2 +- ...=> node-exporter.web01.l3d.space_tls.conf} | 2 +- 11 files changed, 95 insertions(+), 79 deletions(-) rename templates/files/nginx/sites/{node_exporter.mail01.l3d.space_tls => node-exporter.mail01.l3d.space_tls.conf} (95%) rename templates/files/nginx/sites/{node_exporter.services.l3d.space_tls => node-exporter.services.l3d.space_tls.conf} (95%) rename templates/files/nginx/sites/{node_exporter.web01.l3d.space_tls => node-exporter.web01.l3d.space_tls.conf} (95%) diff --git a/collections/ansible_collections/ansible/posix b/collections/ansible_collections/ansible/posix index 2f69930..719f7df 160000 --- a/collections/ansible_collections/ansible/posix +++ b/collections/ansible_collections/ansible/posix @@ -1 +1 @@ -Subproject commit 2f699307c75ab26e8fc4b77c74943e639fbe6615 +Subproject commit 719f7dfebf214388d68ed9d431cc471d961325a7 diff --git a/collections/ansible_collections/community/crypto b/collections/ansible_collections/community/crypto index 75934cd..f2ebae6 160000 --- a/collections/ansible_collections/community/crypto +++ b/collections/ansible_collections/community/crypto @@ -1 +1 @@ -Subproject commit 75934cdd8c5ca7d3b113f35d77bf0c85abf55cc3 +Subproject commit f2ebae635a5e50a91f3a03576b73347b38271408 diff --git a/collections/ansible_collections/community/general b/collections/ansible_collections/community/general index fce91eb..af5da7d 160000 --- a/collections/ansible_collections/community/general +++ b/collections/ansible_collections/community/general @@ -1 +1 @@ -Subproject commit fce91ebbd4409349e5575cc8fcdcfec807bb9eed +Subproject commit af5da7d412a6d1e262715a05d40e091d8ed6b08b diff --git a/host_vars/mail01.l3d.space/vars.yml b/host_vars/mail01.l3d.space/vars.yml index cf7be59..ec5f802 100644 --- a/host_vars/mail01.l3d.space/vars.yml +++ b/host_vars/mail01.l3d.space/vars.yml @@ -44,12 +44,16 @@ postfix__db_user: "{{ _mailserver__mysql_user }}" postfix__db_password: "{{ _mailserver__mysql_password }}" postfix__db_name: "{{ _mailserver__mysql_database }}" +acme_domain_unwant_list: + - name: 'node_exporter.imail01.l3d.space' +# - name: 'example.com' + nginx_sites: - name: 'mail.l3d.space' webroot: user: 'mailwebuser' - name: "{{ mailserver_domain }}" - - name: 'node_exporter.mail01.l3d.space' + - name: 'node-exporter.mail01.l3d.space' # letsencrypt acme_notification_email: "{{ _acme_notification_email }}" @@ -111,3 +115,7 @@ fail2ban_jail_configuration: section: 'dovecot' nginx__infrastructure_domain__enabled: false + +# l3d.nginx_exporter +nginx_exporter_listen_address: '127.0.0.1:9113' +nginx_exporter_scrape_uri: 'https://node-exporter.mail01.l3d.space/stub_status' diff --git a/host_vars/services.l3d.space/vars.yml b/host_vars/services.l3d.space/vars.yml index 52ca61f..bed36dd 100644 --- a/host_vars/services.l3d.space/vars.yml +++ b/host_vars/services.l3d.space/vars.yml @@ -1,12 +1,13 @@ --- -acme_domain_unwant_list: [] +acme_domain_unwant_list: + - name: 'node_exporter.services.l3d.space' # - name: 'example.com' nginx_sites: - name: 'etebase.l3d.ch' - name: 'grafana.l3d.ch' - name: 'www.grafana.l3d.ch' - - name: 'node_exporter.services.l3d.space' + - name: 'node-exporter.services.l3d.space' acme_notification_email: "{{ _acme_notification_email }}" @@ -39,3 +40,7 @@ grafana_dashboards: - dashboard_id: '1860' revision_id: '33' datasource: '{{ grafana_datasources.0.name }}' + +# l3d.nginx_exporter +nginx_exporter_listen_address: '127.0.0.1:9113' +nginx_exporter_scrape_uri: 'https://node-exporter.services.l3d.space/stub_status' diff --git a/host_vars/services.l3d.space/vault.yml b/host_vars/services.l3d.space/vault.yml index 3c1cbfb..13de558 100644 --- a/host_vars/services.l3d.space/vault.yml +++ b/host_vars/services.l3d.space/vault.yml @@ -1,68 +1,66 @@ $ANSIBLE_VAULT;1.1;AES256 -61353638363639336239346431656231666132323335373464313465353265343661366532363165 -3563396663646334663138393362633832386263643831360a333266383535303138643537663034 -39356134336139613938376231346536343035626434666430353830633033393236353766626361 -6664373534306132300a343131363230633637366232393561333063623763386134346438326132 -31313432353664623933363333326630633539616235326230656634653732623231343636306463 -61326139666639316633626164326532346137363838396566636536376334376635303434346465 -39613730373631396663363530623532373631626335613633383938613161313961373238663366 -65316634376431623761313164643561646431303238376563313630643132653666313430366163 -63656334303431633063303334323064393037663334396265343362663566636564316362656435 -63643965306161366331646235393836626439373932386164323863393461326236323562626266 -34653132323037346339383437326638666639343537363937363939366339383336653331663832 -33613061623762346237303866643535633661626665653336333061663531343363633230643130 -61613133313766336630643538343736663433373539323331353034376437336563626461386366 -30336438343066393666333165343062613830333936356361643736656532313966653263306237 -30303363633230306235383938313731333032313362643836316564316562316661376366316539 -63333135643364393231363631653939656136633638656331633034613135303733346263393833 -64353639383631643432306337663536633638636130316466336562363939333961666564613764 -30343131636334646235653230356536306534333666316534626433646431643936383465306231 -36623134656633616437666137323036346539636235613034383262386536333034353730363163 -35323861643737356239653933353635663830663236326532616634336663626234666438396539 -34316536633061323561373337383466373438316264643166623635353132346365323636376630 -63623361336330646131626136323235663033653763653138306431623530633431356662343738 -66653664363638366233313236623565363338636631656437373439376166323032636266366434 -32353261636330663265373766653062323037343736333032343339626665383131313832383965 -38323936383230373036623539346263393333656236376333373936303439333238383936323764 -37323237656665323565323931643762323730646630306531333936616465643335356539313837 -66666435316638353333643335393765343164633265646234386663306464333336306566303136 -62356166316638333864383539393065383964343763363362663066326163383139623765363533 -34623466373434663864386535633535626135653962373531316530376436363335336331333131 -63303734633465306530313734613538636464663562373061356338363537363932323263313335 -61653536383963666365653261316234643633343937336637373731313635396438373366626235 -37396465343461396663336130356430383866366635356631373230346237613835303461383766 -65356361346439303335353165356366643735323066353333623538396437653764653236366138 -35656439363637343263393436343337316634396339613761333764666535333034303839316434 -31623232356361393633626434343165343933663133376535346330653636363566366130346661 -64656565353066366261383632626132653837326566663732616232643532666164323032393439 -37646163363166613436306133306331653766326263646131343133666263626161383936356130 -66393839616362333239313539346465616565643038333632633432653063376666383539313430 -32333663336230613665613335646330663533376164363830393564333563306432393331643666 -38326136353431656136333833643163623437336436386661366166376130663766623961643439 -39393562656361306138666339343566343563363065336433626162366534356262323830656362 -64643530613038613966393963323533333836376631646139643930633631663837373133613865 -30643961336439636262643262353536646265323134306538626566303539346563363738306533 -61663166663832353133366130303133623733373864616366323330623962613635643335343933 -61303533336638353538656162343166336632653633373632363137393939373439653863633930 -61376164633666396332303265313361346430666233656239336664323862663938646261313239 -39666233313431313636646638313265633061326638336237383064633332346330346639376264 -65613637663163633031663365633631333533353533633739303034636637643431626631366564 -33356164623862363261346638613038613036333538303062386463646164366334306139636537 -34353163393666613835373763346332663135356132653362353132646165646434373661636163 -38653538376634636430313336383330666534386565646537333030303138663762653932626631 -63343231643231386635336632653336373362333939396232626566336135623161363438663136 -66383030376635666337326531353836393535656237313538636432363432386161353734356134 -34363166306266616338326162356130326462363037343733373439386262633639363130653534 -64323239643262303261663131356433393036353536653736613939356666663838383461356337 -61663365653335316162333764323335626363353366386565363561323362306439326139636665 -37663739613738353835643865666564366639326533663236646234333834393464366632383337 -63316530393235373637363564376166373633666236613930646461336665303338326663386337 -64363065646165303639626236333735343063386539363964326264353364343839306639643537 -33636461323034613466343730393363356230383730663962623230666664366164306464353030 -32326163346662623863666538343365353965653632343437373636393966323439333837653062 -33333164316265643432353936363563363733336431336639323839393365373766303538656362 -35653165383838356563643064336262646435323533376536316232623961613163303566343535 -30646165356235363339376133653138323030666239646535383734316161636531386130636664 -66373831616364663130366336316339616565666364623633396433653036336631393332396534 -30346533303262373038336639656263333339346361343166333234313532316531316637376637 -323433373463333162333161663735653535 +66353239353261346266343339303763373165646634656132393732336430323365653036346231 +6335626530613662363737636436663937643433373938610a333535353836313034343935393130 +39333262656264393833343338343836373531653965396631353438663564616362316466363436 +6663353731306236330a643763303333383962633635663063396230653135656634636162333563 +63346562656566623864303136623638333538666430313430313032656236336563313637633631 +35623737396464383266336439383534373761353665306566623838663833323165653761633537 +61363063626264626466303762643966396631383962356630313735623366623332636337303064 +38383032343661643935663636346338356335396466316436663866653132323935626166636564 +36633539343263633031643462613534653561326364363864616139613763306334303133363639 +65326432353062663664656165313338646634343535653736633662373463343635613461386664 +30306533303534393733366666303233646134653366336432373233666239663563316331636465 +34313430663239363661393834626238313633363066656265643032346637653737383932376165 +35373835633163343563353265656261653135643962666334386362376534353465323030363636 +64393161303939373339316136383766316564303331666135353930316235663738323932353161 +30653934376663616363646563316531663661343165656563323537643030386130373535336163 +66666363323138333464383466393235336338303439326132346162613833383439346662393334 +32656434363732313435303863333037373534636438313264623634373130303164336437323634 +63326332393034363465376231373639303233376162363337643463656437323663373831383865 +31623131363661376563396661623835303236643633306665633536623830333731333062316538 +39323632353938346534393662643862333065363233323034656464323535636237356432666537 +66303436373531383934326637353261666636366530643537646465366236656361313735656134 +36346338306637326165346162353435373661643034396565356366636362383663646461636166 +33313935633462346237356162303336373135666263383533623835623461323361306261356631 +32373661386566393762633835353930633936313964623133363239616331653132633266653134 +34643561663730643461333965353034313833623937656663393062626633356262346338306664 +38303733613031346466633966626164346265373162386361343139383966363935613533663864 +39386235303163663535333236616162356564656632316466326331646463303164393163363735 +34303063396336653637303461663265323061653266663833636135303030666635326661623130 +61623664623737303865346463303035376564343030653535353064316338303032313239383635 +37316163653862313638613436613133663831643762306634623831366535313134376631386637 +37626336323764356363316663306234613566616338376466343464643233366138313835333933 +38616365306463316432336638316465626635666266316164623337313233383832633833666433 +34393161386232663733646164616135663836626634333936613163393535316362323563323162 +37616635633832376162306561666236386636333532333362393031623563386566333633356138 +32613133663131333931326538313332316630316462323636323031353261656133646336366136 +32326535393936326164323863646433626335376230353831356537613230373332393934356633 +31653533323065666530303539663333666436393131366665376337636163383232616566366239 +31303330356363643139363234613966306535383238326265316436363235396139396530343561 +62396330613964646238393437383130393934346363623139626538326365306235313939646566 +37666164616439663737646431316235326263383239623833373066303831383839353231373737 +66376636363134643031366332643135623939333736646531333534663366333236616439623038 +34653462643436366235373138653039323034326438386233396633626163393463343233633234 +64623233376531653035646462396366353833656431613963636466356532643064346530333366 +63356364393266316432353862626435613166373465633464303330303136656636653539663638 +33363034363732353938333361663631356363633235396232343366333433376266316231323266 +36373862323866326365306362653436343135343032396537613633306264373038383237323435 +39643633623862303263633765303466376535646564393835323139623166376235373136636138 +30613563353763366463613961633337633638653337333834386463346635373461373237623163 +37303539616233343465656233613335666535643431373566616439383537396630373765313534 +64353134306131396338663265373037396565323934643038343231336265303838326632343764 +64356166343434343335323134643332343634343338396338313239666231393739393530343732 +32636561386365386331333237326565373532363131623937636632333032373635353935333562 +35643461643730623465326631313961393162313035326161643339333062333961623936323332 +61303666353434366364653131313636633964346565333566626164663838323030626538386432 +36343364613133386566376131663136396637393138316266333935313463386533383833373032 +31663337653834303764326666643336363766353963343633653037396136633436376238376431 +30613438626165373232633863336235303634336464313465383033343365303538373135313638 +30643333316234396532313863623362343239663762396535653762373265316536643732386131 +37383132323666383363303965316633303638636339386135656432363034333531353164363933 +66366463363035633732343465356264623430393333383165323364306365363239386430626566 +30353230653466323464333238353231313130383061663532313963626235656230303537643435 +38303634306263383738633338663139313132656363326637633530323765333363323635363666 +38353530363334333231356666353463613735616233633461363866356135633833616335343865 +61366161643938333231383539633236366565393833633634393738613065643033633865666664 +6361 diff --git a/host_vars/web01.l3d.space/vars.yml b/host_vars/web01.l3d.space/vars.yml index c163ae9..ba2710c 100644 --- a/host_vars/web01.l3d.space/vars.yml +++ b/host_vars/web01.l3d.space/vars.yml @@ -114,7 +114,8 @@ acme_reload_services: acme_restart_services: - 'gitea' -acme_domain_unwant_list: [] +acme_domain_unwant_list: + - name: 'node_exporter.web01.l3d.space' # - name: 'example.com' nginx_sites: @@ -193,7 +194,7 @@ nginx_sites: webroot: user: 'klima' - name: 'www.klima-streik.de' - - name: 'node_exporter.web01.l3d.space' + - name: 'node-exporter.web01.l3d.space' acme_notification_email: "{{ _acme_notification_email }}" @@ -267,3 +268,7 @@ gitea_attachment_max_size: 35 gitea_disable_git_hooks: "{{ _gitea_disable_git_hooks }}" gitea_disable_registration: "{{ _gitea_disable_registration }}" gitea_show_registration_button: "{{ _gitea_show_registration_button }}" + +# l3d.nginx_exporter +nginx_exporter_listen_address: '127.0.0.1:9113' +nginx_exporter_scrape_uri: 'https://node-exporter.web01.l3d.space/stub_status' diff --git a/site.yml b/site.yml index 91b1f48..7357af7 100644 --- a/site.yml +++ b/site.yml @@ -25,7 +25,7 @@ - {role: robertdebock.fail2ban, tags: [default, fail2ban], become: true} - name: Setup Webserver - hosts: nginx + hosts: all roles: - {role: do1jlr.webhost, tags: [web, webhost], become: true} - {role: do1jlr.acmetool, tags: [web, acmetool], become: true} diff --git a/templates/files/nginx/sites/node_exporter.mail01.l3d.space_tls b/templates/files/nginx/sites/node-exporter.mail01.l3d.space_tls.conf similarity index 95% rename from templates/files/nginx/sites/node_exporter.mail01.l3d.space_tls rename to templates/files/nginx/sites/node-exporter.mail01.l3d.space_tls.conf index 78bb597..4cc39d5 100644 --- a/templates/files/nginx/sites/node_exporter.mail01.l3d.space_tls +++ b/templates/files/nginx/sites/node-exporter.mail01.l3d.space_tls.conf @@ -2,7 +2,7 @@ server { listen 443 ssl http2; listen [::]:443 ssl http2; - server_name node_exporter.mail01.l3d.space; + server_name node-exporter.mail01.l3d.space; include snippets/tls_parameters_{{ site.name }}.snippet.conf; include snippets/tls_certificate_{{ site.name }}.snippet.conf; diff --git a/templates/files/nginx/sites/node_exporter.services.l3d.space_tls b/templates/files/nginx/sites/node-exporter.services.l3d.space_tls.conf similarity index 95% rename from templates/files/nginx/sites/node_exporter.services.l3d.space_tls rename to templates/files/nginx/sites/node-exporter.services.l3d.space_tls.conf index 6c04546..a034b02 100644 --- a/templates/files/nginx/sites/node_exporter.services.l3d.space_tls +++ b/templates/files/nginx/sites/node-exporter.services.l3d.space_tls.conf @@ -2,7 +2,7 @@ server { listen 443 ssl http2; listen [::]:443 ssl http2; - server_name node_exporter.services.l3d.space; + server_name node-exporter.services.l3d.space; include snippets/tls_parameters_{{ site.name }}.snippet.conf; include snippets/tls_certificate_{{ site.name }}.snippet.conf; diff --git a/templates/files/nginx/sites/node_exporter.web01.l3d.space_tls b/templates/files/nginx/sites/node-exporter.web01.l3d.space_tls.conf similarity index 95% rename from templates/files/nginx/sites/node_exporter.web01.l3d.space_tls rename to templates/files/nginx/sites/node-exporter.web01.l3d.space_tls.conf index 486e3e7..4848fa5 100644 --- a/templates/files/nginx/sites/node_exporter.web01.l3d.space_tls +++ b/templates/files/nginx/sites/node-exporter.web01.l3d.space_tls.conf @@ -2,7 +2,7 @@ server { listen 443 ssl http2; listen [::]:443 ssl http2; - server_name node_exporter.web01.l3d.space; + server_name node-exporter.web01.l3d.space; include snippets/tls_parameters_{{ site.name }}.snippet.conf; include snippets/tls_certificate_{{ site.name }}.snippet.conf;