diff --git a/ansible/playbooks/paas/main.yml b/ansible/playbooks/paas/main.yml index 37711b31..00b3e201 100644 --- a/ansible/playbooks/paas/main.yml +++ b/ansible/playbooks/paas/main.yml @@ -24,6 +24,7 @@ ansible.builtin.apt: pkg: - python3-debian + - python3-venv - unzip - make - jq @@ -38,7 +39,10 @@ roles: - unattended-upgrades + - ansible-ufw +- name: Configure timesyncd + ansible.builtin.import_playbook: timesyncd.yml - name: Configure systemd resolved ansible.builtin.import_playbook: systemd-resolved.yml - name: Configure docker diff --git a/ansible/playbooks/paas/metrology.yml b/ansible/playbooks/paas/metrology.yml index 56718234..ac821230 100644 --- a/ansible/playbooks/paas/metrology.yml +++ b/ansible/playbooks/paas/metrology.yml @@ -4,10 +4,6 @@ hosts: "{{ hosts_limit | default('infrastructure') }}" gather_facts: true become: true - vars_prompt: - - name: project - prompt: project name - private: false tasks: - name: End the play for hosts that are not in admins group ansible.builtin.meta: end_host diff --git a/ansible/playbooks/paas/roles/prometheus/templates/config.j2 b/ansible/playbooks/paas/roles/prometheus/templates/config.j2 index 1800f2ab..36b81926 100644 --- a/ansible/playbooks/paas/roles/prometheus/templates/config.j2 +++ b/ansible/playbooks/paas/roles/prometheus/templates/config.j2 @@ -66,7 +66,7 @@ scrape_configs: regex: "^(__tmp_keep_me)$" static_configs: -{% for item in groups['infrastructure'] | default([]) if item.split('.')[4] == project %} +{% for item in groups['infrastructure'] | default([]) if item.split('.')[4] == prometheus_project %} - targets: ['{{ hostvars[item]['ansible_' + hostvars[item].nomad_iface]['ipv4']['address'] }}:9100'] labels: instance: "{{ item }}" @@ -178,7 +178,7 @@ scrape_configs: tls_config: insecure_skip_verify: true static_configs: -{% for item in groups['infrastructure'] | default([]) if item.split('.')[4] == project %} +{% for item in groups['infrastructure'] | default([]) if item.split('.')[4] == prometheus_project %} - targets: ['{{ hostvars[item]['ansible_' + hostvars[item].nomad_iface]['ipv4']['address'] }}:9558'] labels: instance: "{{ item }}" @@ -194,7 +194,7 @@ scrape_configs: format: ['prometheus'] metrics_path: /metrics static_configs: -{% for item in groups['infrastructure'] | default([]) if item.split('.')[4] == project %} +{% for item in groups['infrastructure'] | default([]) if item.split('.')[4] == prometheus_project %} - targets: ['{{ hostvars[item]['ansible_' + hostvars[item].nomad_iface]['ipv4']['address'] }}:9835'] labels: instance: "{{ item }}" @@ -214,7 +214,7 @@ scrape_configs: tls_config: insecure_skip_verify: true static_configs: -{% for item in groups['infrastructure'] | default([]) if item.split('.')[4] == project %} +{% for item in groups['infrastructure'] | default([]) if item.split('.')[4] == prometheus_project %} - targets: ['{{ hostvars[item]['ansible_' + hostvars[item].nomad_iface]['ipv4']['address'] }}:4646'] labels: instance: "{{ item }}" @@ -246,7 +246,7 @@ scrape_configs: tls_config: insecure_skip_verify: true static_configs: -{% for item in groups['infrastructure'] | default([]) if item.split('.')[4] == project %} +{% for item in groups['infrastructure'] | default([]) if item.split('.')[4] == prometheus_project %} - targets: ['{{ hostvars[item]['ansible_' + hostvars[item].nomad_iface]['ipv4']['address'] }}:9080'] labels: instance: "{{ item }}" diff --git a/ansible/playbooks/paas/roles/script_exporter/tasks/main.yml b/ansible/playbooks/paas/roles/script_exporter/tasks/main.yml index 2d9800e5..18e9f440 100644 --- a/ansible/playbooks/paas/roles/script_exporter/tasks/main.yml +++ b/ansible/playbooks/paas/roles/script_exporter/tasks/main.yml @@ -2,13 +2,13 @@ - name: Script_exporter | Include upstream variables ansible.builtin.include_vars: upstream.yml +- name: Script_exporter | Get speedtest script + include_tasks: speedtest.yml + - name: Script_exporter | Get binary include_tasks: build.yml when: ansible_local[image.name] is not defined or ansible_local[image.name] != latest_version -- name: Script_exporter | Get speedtest script - include_tasks: speedtest.yml - - name: Script_exporter | Create custom directories ansible.builtin.file: dest: "{{ item }}" diff --git a/ansible/playbooks/paas/roles/script_exporter/tasks/speedtest.yml b/ansible/playbooks/paas/roles/script_exporter/tasks/speedtest.yml index f3adfe43..02f24233 100644 --- a/ansible/playbooks/paas/roles/script_exporter/tasks/speedtest.yml +++ b/ansible/playbooks/paas/roles/script_exporter/tasks/speedtest.yml @@ -1,50 +1,18 @@ --- -- debug: - msg: "https://install.speedtest.net/app/cli/ookla-speedtest-1.2.0-linux-{{ script_exporter_scripts.speedtest.architecture_map[ansible_facts.architecture] }}.tgz" +- name: Install speedtest packages + ansible.builtin.apt: + pkg: + - speedtest-cli -- name: Script_exporter | Create temporary build directory - ansible.builtin.file: - path: "{{ item }}" - recurse: true - state: directory - mode: '0755' - loop: - - "{{ build_work_dir }}/download" - - "{{ build_work_dir }}/{{ upstream_default_arch }}" - -- name: Script_exporter | Download speedtest script - ansible.builtin.get_url: - url: "https://install.speedtest.net/app/cli/ookla-speedtest-1.2.0-linux-{{ script_exporter_scripts.speedtest.architecture_map[ansible_facts.architecture] }}.tgz" - dest: "{{ build_work_dir }}/download/speedtest.tgz" - mode: '0644' - force: no - register: download_result - -- name: Script_exporter | Unarchive speedtest script - ansible.builtin.unarchive: - src: "{{ build_work_dir }}/download/speedtest.tgz" - dest: "{{ build_work_dir }}/download" - remote_src: true - when: download_result.changed - -- name: Script_exporter | Install binary +- name: Script_exporter | Install speedtest-exporter ansible.builtin.copy: - src: "{{ build_work_dir }}/download/speedtest" + src: speedtest-exporter dest: /usr/local/bin/ owner: root group: root mode: '0755' - remote_src: true -- name: Script_exporter | Clean up +- name: Script_exporter | Remove old speedtest binary (TODO remove) ansible.builtin.file: - path: "{{ build_work_dir }}" - state: absent - -- name: Script_exporter | Install speedtest-exporter - ansible.builtin.copy: - src: speedtest-exporter - dest: /usr/local/bin/ - owner: root - group: root - mode: '0755' \ No newline at end of file + path: /usr/local/bin/speedtest + state: absent \ No newline at end of file diff --git a/ansible/playbooks/paas/roles/script_exporter/vars/main.yml b/ansible/playbooks/paas/roles/script_exporter/vars/main.yml index bf894c1f..bc4cdbcc 100644 --- a/ansible/playbooks/paas/roles/script_exporter/vars/main.yml +++ b/ansible/playbooks/paas/roles/script_exporter/vars/main.yml @@ -22,4 +22,4 @@ script_exporter_scripts: armv7: armhf amd64: amd64 x86_64: x86_64 - aarch64: aarch64 + aarch64: arm64 diff --git a/ansible/playbooks/saas/roles/mosquitto/templates/mosquitto-no-auth.conf.j2 b/ansible/playbooks/saas/roles/mosquitto/templates/mosquitto-no-auth.conf.j2 index 824c341d..41adaf2e 100644 --- a/ansible/playbooks/saas/roles/mosquitto/templates/mosquitto-no-auth.conf.j2 +++ b/ansible/playbooks/saas/roles/mosquitto/templates/mosquitto-no-auth.conf.j2 @@ -4,6 +4,6 @@ listener 1883 persistence true persistence_location /mosquitto/data/ -log_type all +log_type error log_dest file /mosquitto/log/mosquitto.log allow_anonymous true diff --git a/ui/controllers/api.js b/ui/controllers/api.js index 73247c4b..2e52aa05 100644 --- a/ui/controllers/api.js +++ b/ui/controllers/api.js @@ -10,8 +10,8 @@ exports.install = function() { ROUTE('+API /api/ -users_remove/{id} --> Users/remove'); ROUTE('-API /api/ +login --> Users/login'); - ROUTE('+API /api/ -settings_read --> Users/settings_read'); - ROUTE('+API /api/ +settings_update --> Users/settings_update'); + ROUTE('+API /api/ -profile_read --> Users/profile_read'); + ROUTE('+API /api/ +profile_update --> Users/profile_update'); ROUTE('+API /api/ +password --> Users/password_update'); ROUTE('+GET /logout/ --> Users/logout'); diff --git a/ui/definitions/init.js b/ui/definitions/init.js index 6caff296..0c016e05 100644 --- a/ui/definitions/init.js +++ b/ui/definitions/init.js @@ -1,14 +1,4 @@ CONF.$customtitles = true; CONF.version = '1.1'; -MAIN.users = []; - -(async function() { - var tmp = []; - for (let m of tmp) { - if (m !== null && m !== 'bot') - MAIN.users.push(m); - } -})(); - LOCALIZE(ctrl => ctrl.query.language || (ctrl.user ? ctrl.user.language : CONF.language)); \ No newline at end of file diff --git a/ui/index.js.map b/ui/index.js.map index 41feaf24..029b074c 100644 --- a/ui/index.js.map +++ b/ui/index.js.map @@ -60,16 +60,16 @@ "method": "API", "url": "/api/", "auth": 1, - "id": "settings_read", - "name": "Read a user information" + "id": "profile_read", + "name": "Read user profile" }, { "method": "API", "url": "/api/", "auth": 1, - "id": "settings_update", + "id": "profile_update", "input": "*first_name:String, *last_name:String, *email:Email, *language:String", - "name": "Save settings" + "name": "Save user profile" }, { "method": "API", @@ -532,10 +532,10 @@ "input": "*email:Email,*password:String" }, { - "name": "Users/settings_read" + "name": "Users/profile_read" }, { - "name": "Users/settings_update", + "name": "Users/profile_update", "input": "*first_name:String, *last_name:String, *email:Email, *language:String" }, { diff --git a/ui/public/forms/settings.html b/ui/public/forms/profile.html similarity index 81% rename from ui/public/forms/settings.html rename to ui/public/forms/profile.html index 10610c07..68121728 100644 --- a/ui/public/forms/settings.html +++ b/ui/public/forms/profile.html @@ -1,4 +1,4 @@ -