diff --git a/ansible/host_vars/monitoring.ooni.org/vars.yml b/ansible/host_vars/monitoring.ooni.org/vars.yml index 9dd0a898..1f9dcfa4 100644 --- a/ansible/host_vars/monitoring.ooni.org/vars.yml +++ b/ansible/host_vars/monitoring.ooni.org/vars.yml @@ -13,6 +13,7 @@ prometheus_basic_auth_password: "{{ vault_prometheus_basic_auth_password }}" alertmanager_slack_api_url: '{{ vault_alertmanager_slack_api_url }}' grafana_admin_password: "{{ vault_grafana_admin_password }}" grafana_secret_key: "{{ vault_grafana_secret_key }}" # to sign cookies +grafana_cloud_api_token: "{{ vault_grafana_cloud_api_token }}" # for sending data to grafana cloud prometheus_listen_address: "127.0.0.1:8090" alertmanager_listen_address: "127.0.0.1:9093" diff --git a/ansible/host_vars/monitoring.ooni.org/vault b/ansible/host_vars/monitoring.ooni.org/vault index c072ef47..d298787f 100644 --- a/ansible/host_vars/monitoring.ooni.org/vault +++ b/ansible/host_vars/monitoring.ooni.org/vault @@ -1,26 +1,34 @@ $ANSIBLE_VAULT;1.1;AES256 -39323462306464623236623763633561303765353939336631373238643364326534396239303161 -6563643661653539623037616362343331333833663739310a663434656131366366613661616434 -61316134383261623761326634363633393362386237633666393134346266653432323363356239 -6634633238383262640a363363353434346566393938313235653933366130363364396534613732 -38643533626236333766323631626437366331663462383037376166353265636661316261386539 -63303934613465656261636632356566643233626136356639663135626436376337613731353730 -64613562643566663561623262383732663130393539636631626366326237353235396432663339 -66613038396338303663373763323338343536613365306331656464393061666166343633356539 -36353637656231626432366339613266343634383362636637373537663131646461626232636461 -31636139346539333032663632393030646435376330626365333834666531356433373234653664 -36383266376665346439663031323433613464366530666230393239393135356433363861306562 -30396663336330383536376239663430336239663862346461323865666336333163353136646264 -61626163363535363066393236613032376531346165623461356531616566653062356261353130 -31616535303433326432633433353861363563343437323736613733663439646564626166343531 -37306234363435336138616239306466663134613761386232303861323332303930386636343830 -36623531306431346639383266363234316461333065646631653532626431356166356333633137 -64636533333737383238633366653565303932366263353366306632623637373539303665303061 -61313164643634636262383230353931356163626466633436303165663631313833373063633165 -66343535623832353630326262326663633432613863633739643132333137653730336232383432 -61303432373533613361323138633361323633306234663865636136633733636439313561343566 -65363435393639393564643633346161653866383234393537396462633736343463623832353539 -32336236613138313538373738333565383531633033396231666262333338356237633337383033 -35613463396265373732633462646239366266613331313963383930356234336339386463303432 -39336538663037343233353166336330323562326132336539373031383265316438636439376336 -3764 +30626430623165303966346666353063313865656563653237613262323662643331313561343032 +6666653434633562316466333465343863353138343265660a616530636436373064306432643261 +34383365353633396162313830353363653363656232366233623365643939346338633261616235 +6434636363356538320a623866386239663264636236343336643737636230323533393230343735 +62643066316165373562643537336634343437393264616433613165636538643662656164383338 +31376437303461323834336639383863616563656638626436303838373632303466653366323137 +66366238646163346337376531313462306436653032383463363430656632313938333262303964 +38656637643338643336656663386139356635343862653433363038323734393538333364303130 +31343631316166613564666331326435316134616238386535323930383036303436623130373764 +38663633383730663334346539326431663632336235313934373836386461353831623635623637 +36386131653134326539386464376264383233356438343738316538623238643930313261306563 +61386664353536666235303335613461363461306630623835616434323436653962303766623838 +61333539646638656439616162366339333465303737313537303566386432366236656638386135 +66653435323534643230396639376463393262386462623237616664386635396361366339313235 +37363732383538343166636137613438363965636135623963373236626366623062313061306539 +35616337356163666336666233363161366665383036633961323338363938303933333036333030 +30613231363965633532663134303339303563336432376233613962306365393931303237343266 +36303765313831376633323035306634323033393236366636646336366366383463313539656539 +36326361393837656337333431623638393363346337383266626361653134303263646461316661 +64336431393838353963663163353762646262363832383266393963613431653965656364613466 +66316465353461643335646638336666636562353664363031623635613965616466656433373432 +39356235326537353035386331323961363230316163353630396262663231663364386535333863 +63303561333537306339386636343733663535393362393966653762386431323933383031343261 +39613337333338333737393964653933656438336463343134313638623365363634656631333965 +65623136343237313236343463623832623631393239613338653531653837656239396638663433 +37356235343066363136333562313936396663373433383066396532313536386263323231623335 +64323563633134643231323838666434663433343331623363306633306632616335343866643337 +62643230363563613333386633613631303432616333653634306362366137383432626131366239 +32653962363763363531623938613138623231323161363434343734643736363763396233373739 +64303566663237643863353538323932313938393832326534663734623162356235306638333634 +65376465336438306337626663313539623063333232313037643061353462366562313335643762 +61396237626162306230376431393963643662353866663131333964363534373965356366306466 +36613361326237626264316431633465356661333635643862396466333234363439 diff --git a/ansible/roles/prometheus/defaults/main.yml b/ansible/roles/prometheus/defaults/main.yml index 7719bde2..a3f46952 100644 --- a/ansible/roles/prometheus/defaults/main.yml +++ b/ansible/roles/prometheus/defaults/main.yml @@ -3,3 +3,4 @@ prometheus_ssl_dir: /etc/prometheus/ssl prometheus_exporter_cert: "/etc/prometheus/exporter_ca.cert" prometheus_basic_auth_user: "prometheus" prometheus_basic_auth_password: "{{ CHANGE_ME }}" +grafana_cloud_api_token: "{{ CHANGE_ME }}" diff --git a/ansible/roles/prometheus/templates/prometheus.yml.j2 b/ansible/roles/prometheus/templates/prometheus.yml.j2 index a6aeb27b..374ae714 100755 --- a/ansible/roles/prometheus/templates/prometheus.yml.j2 +++ b/ansible/roles/prometheus/templates/prometheus.yml.j2 @@ -135,4 +135,9 @@ scrape_configs: - backend-hel.ooni.org:444 - ams-pg-test.ooni.org:444 +#remote_write: +# - url: https://prometheus-prod-24-prod-eu-west-2.grafana.net/api/prom/push +# basic_auth: +# username: 1412863 +# password: {{ grafana_cloud_api_token }} ...