From 31fa8f3e9c85a6dcc2b0530a8621d1d3c55ea594 Mon Sep 17 00:00:00 2001 From: Sebastien Laithier Date: Thu, 18 Aug 2022 10:19:10 +0200 Subject: [PATCH] Refactor --- README.md | 65 +++++++++++++++-- ansible/2022-08-17.csv | 19 ----- ansible/README.md | 22 ------ ansible/ansible.cfg | 12 ---- .../update_dashboard.cpython-38.pyc | Bin 1267 -> 0 bytes ansible/hooks/update_dashboard.py | 23 ------ ansible/hosts-tst | 44 ------------ ansible/playbooks/auto-updates-result.yml | 55 -------------- ansible/playbooks/main.yml | 47 ------------ ansible/playbooks/packages.yml | 68 ------------------ ansible/playbooks/packages_include.yml | 10 --- {front/dashboard => dashboard}/__init__.py | 0 {front/dashboard => dashboard}/admin.py | 0 {front/dashboard => dashboard}/apps.py | 0 .../dashboard => dashboard}/fixtures/os.yaml | 0 .../fixtures/teams.yaml | 0 {front/dashboard => dashboard}/models.py | 0 {front/dashboard => dashboard}/module.py | 0 .../static/css/bootstrap-rtl.css | 0 .../static/css/bootstrap-rtl.min.css | 0 .../static/css/bootstrap.css | 0 .../static/css/bootstrap.min.css | 0 .../static/css/custom.css | 0 .../static/css/datatables.min.css | 0 .../static/css/plugins/morris.css | 0 .../static/css/sb-admin-rtl.css | 0 .../static/css/sb-admin.css | 0 .../static/font-awesome/css/font-awesome.css | 0 .../font-awesome/css/font-awesome.min.css | 0 .../static/font-awesome/fonts/FontAwesome.otf | Bin .../fonts/fontawesome-webfont.eot | Bin .../fonts/fontawesome-webfont.svg | 0 .../fonts/fontawesome-webfont.ttf | Bin .../fonts/fontawesome-webfont.woff | Bin .../font-awesome/less/bordered-pulled.less | 0 .../static/font-awesome/less/core.less | 0 .../static/font-awesome/less/fixed-width.less | 0 .../font-awesome/less/font-awesome.less | 0 .../static/font-awesome/less/icons.less | 0 .../static/font-awesome/less/larger.less | 0 .../static/font-awesome/less/list.less | 0 .../static/font-awesome/less/mixins.less | 0 .../static/font-awesome/less/path.less | 0 .../font-awesome/less/rotated-flipped.less | 0 .../static/font-awesome/less/spinning.less | 0 .../static/font-awesome/less/stacked.less | 0 .../static/font-awesome/less/variables.less | 0 .../font-awesome/scss/_bordered-pulled.scss | 0 .../static/font-awesome/scss/_core.scss | 0 .../font-awesome/scss/_fixed-width.scss | 0 .../static/font-awesome/scss/_icons.scss | 0 .../static/font-awesome/scss/_larger.scss | 0 .../static/font-awesome/scss/_list.scss | 0 .../static/font-awesome/scss/_mixins.scss | 0 .../static/font-awesome/scss/_path.scss | 0 .../font-awesome/scss/_rotated-flipped.scss | 0 .../static/font-awesome/scss/_spinning.scss | 0 .../static/font-awesome/scss/_stacked.scss | 0 .../static/font-awesome/scss/_variables.scss | 0 .../font-awesome/scss/font-awesome.scss | 0 .../fonts/glyphicons-halflings-regular.eot | Bin .../fonts/glyphicons-halflings-regular.svg | 0 .../fonts/glyphicons-halflings-regular.ttf | Bin .../fonts/glyphicons-halflings-regular.woff | Bin .../fonts/glyphicons-halflings-regular.woff2 | Bin .../static/images/favicon.ico | Bin .../static/js/bootstrap.js | 0 .../static/js/bootstrap.min.js | 0 .../static/js/datatables.min.js | 0 .../static/js/html-to-csv.js | 0 .../static/js/jquery.js | 0 .../static/js/plugins/flot/excanvas.min.js | 0 .../static/js/plugins/flot/flot-data.js | 0 .../static/js/plugins/flot/jquery.flot.js | 0 .../static/js/plugins/flot/jquery.flot.pie.js | 0 .../js/plugins/flot/jquery.flot.resize.js | 0 .../plugins/flot/jquery.flot.tooltip.min.js | 0 .../static/js/plugins/morris/morris-data.js | 0 .../static/js/plugins/morris/morris.js | 0 .../static/js/plugins/morris/morris.min.js | 0 .../static/js/plugins/morris/raphael.min.js | 0 .../templates/404.html | 0 .../templates/generic.html | 0 .../templates/history.html | 0 .../templates/index.html | 0 .../templates/manage-packages.html | 0 .../templates/manage.html | 0 .../templates/os-statistics.html | 0 .../templates/packages-list.html | 0 .../templates/packages.html | 0 .../templates/registration/login.html | 0 .../templates/server-list.html | 0 .../templates/squeleton.html | 0 {front/dashboard => dashboard}/tests.py | 0 {front/dashboard => dashboard}/urls.py | 0 {front/dashboard => dashboard}/views.py | 0 {front/defaults => defaults}/gunicorn.service | 0 .../defaults => defaults}/settings_local.py | 0 .../updates-dashboard.conf | 0 front/README.md | 63 ---------------- front/manage.py => manage.py | 0 front/requirements.txt => requirements.txt | 0 .../__init__.py | 0 .../settings.py | 0 .../urls.py | 0 .../wsgi.py | 0 106 files changed, 61 insertions(+), 367 deletions(-) delete mode 100644 ansible/2022-08-17.csv delete mode 100644 ansible/README.md delete mode 100644 ansible/ansible.cfg delete mode 100644 ansible/hooks/__pycache__/update_dashboard.cpython-38.pyc delete mode 100644 ansible/hooks/update_dashboard.py delete mode 100644 ansible/hosts-tst delete mode 100644 ansible/playbooks/auto-updates-result.yml delete mode 100644 ansible/playbooks/main.yml delete mode 100644 ansible/playbooks/packages.yml delete mode 100644 ansible/playbooks/packages_include.yml rename {front/dashboard => dashboard}/__init__.py (100%) rename {front/dashboard => dashboard}/admin.py (100%) rename {front/dashboard => dashboard}/apps.py (100%) rename {front/dashboard => dashboard}/fixtures/os.yaml (100%) rename {front/dashboard => dashboard}/fixtures/teams.yaml (100%) rename {front/dashboard => dashboard}/models.py (100%) rename {front/dashboard => dashboard}/module.py (100%) rename {front/dashboard => dashboard}/static/css/bootstrap-rtl.css (100%) rename {front/dashboard => dashboard}/static/css/bootstrap-rtl.min.css (100%) rename {front/dashboard => dashboard}/static/css/bootstrap.css (100%) rename {front/dashboard => dashboard}/static/css/bootstrap.min.css (100%) rename {front/dashboard => dashboard}/static/css/custom.css (100%) rename {front/dashboard => dashboard}/static/css/datatables.min.css (100%) rename {front/dashboard => dashboard}/static/css/plugins/morris.css (100%) rename {front/dashboard => dashboard}/static/css/sb-admin-rtl.css (100%) rename {front/dashboard => dashboard}/static/css/sb-admin.css (100%) rename {front/dashboard => dashboard}/static/font-awesome/css/font-awesome.css (100%) rename {front/dashboard => dashboard}/static/font-awesome/css/font-awesome.min.css (100%) rename {front/dashboard => dashboard}/static/font-awesome/fonts/FontAwesome.otf (100%) rename {front/dashboard => dashboard}/static/font-awesome/fonts/fontawesome-webfont.eot (100%) rename {front/dashboard => dashboard}/static/font-awesome/fonts/fontawesome-webfont.svg (100%) rename {front/dashboard => dashboard}/static/font-awesome/fonts/fontawesome-webfont.ttf (100%) rename {front/dashboard => dashboard}/static/font-awesome/fonts/fontawesome-webfont.woff (100%) rename {front/dashboard => dashboard}/static/font-awesome/less/bordered-pulled.less (100%) rename {front/dashboard => dashboard}/static/font-awesome/less/core.less (100%) rename {front/dashboard => dashboard}/static/font-awesome/less/fixed-width.less (100%) rename {front/dashboard => dashboard}/static/font-awesome/less/font-awesome.less (100%) rename {front/dashboard => dashboard}/static/font-awesome/less/icons.less (100%) rename {front/dashboard => dashboard}/static/font-awesome/less/larger.less (100%) rename {front/dashboard => dashboard}/static/font-awesome/less/list.less (100%) rename {front/dashboard => dashboard}/static/font-awesome/less/mixins.less (100%) rename {front/dashboard => dashboard}/static/font-awesome/less/path.less (100%) rename {front/dashboard => dashboard}/static/font-awesome/less/rotated-flipped.less (100%) rename {front/dashboard => dashboard}/static/font-awesome/less/spinning.less (100%) rename {front/dashboard => dashboard}/static/font-awesome/less/stacked.less (100%) rename {front/dashboard => dashboard}/static/font-awesome/less/variables.less (100%) rename {front/dashboard => dashboard}/static/font-awesome/scss/_bordered-pulled.scss (100%) rename {front/dashboard => dashboard}/static/font-awesome/scss/_core.scss (100%) rename {front/dashboard => dashboard}/static/font-awesome/scss/_fixed-width.scss (100%) rename {front/dashboard => dashboard}/static/font-awesome/scss/_icons.scss (100%) rename {front/dashboard => dashboard}/static/font-awesome/scss/_larger.scss (100%) rename {front/dashboard => dashboard}/static/font-awesome/scss/_list.scss (100%) rename {front/dashboard => dashboard}/static/font-awesome/scss/_mixins.scss (100%) rename {front/dashboard => dashboard}/static/font-awesome/scss/_path.scss (100%) rename {front/dashboard => dashboard}/static/font-awesome/scss/_rotated-flipped.scss (100%) rename {front/dashboard => dashboard}/static/font-awesome/scss/_spinning.scss (100%) rename {front/dashboard => dashboard}/static/font-awesome/scss/_stacked.scss (100%) rename {front/dashboard => dashboard}/static/font-awesome/scss/_variables.scss (100%) rename {front/dashboard => dashboard}/static/font-awesome/scss/font-awesome.scss (100%) rename {front/dashboard => dashboard}/static/fonts/glyphicons-halflings-regular.eot (100%) rename {front/dashboard => dashboard}/static/fonts/glyphicons-halflings-regular.svg (100%) rename {front/dashboard => dashboard}/static/fonts/glyphicons-halflings-regular.ttf (100%) rename {front/dashboard => dashboard}/static/fonts/glyphicons-halflings-regular.woff (100%) rename {front/dashboard => dashboard}/static/fonts/glyphicons-halflings-regular.woff2 (100%) rename {front/dashboard => dashboard}/static/images/favicon.ico (100%) rename {front/dashboard => dashboard}/static/js/bootstrap.js (100%) rename {front/dashboard => dashboard}/static/js/bootstrap.min.js (100%) rename {front/dashboard => dashboard}/static/js/datatables.min.js (100%) rename {front/dashboard => dashboard}/static/js/html-to-csv.js (100%) rename {front/dashboard => dashboard}/static/js/jquery.js (100%) rename {front/dashboard => dashboard}/static/js/plugins/flot/excanvas.min.js (100%) rename {front/dashboard => dashboard}/static/js/plugins/flot/flot-data.js (100%) rename {front/dashboard => dashboard}/static/js/plugins/flot/jquery.flot.js (100%) rename {front/dashboard => dashboard}/static/js/plugins/flot/jquery.flot.pie.js (100%) rename {front/dashboard => dashboard}/static/js/plugins/flot/jquery.flot.resize.js (100%) rename {front/dashboard => dashboard}/static/js/plugins/flot/jquery.flot.tooltip.min.js (100%) rename {front/dashboard => dashboard}/static/js/plugins/morris/morris-data.js (100%) rename {front/dashboard => dashboard}/static/js/plugins/morris/morris.js (100%) rename {front/dashboard => dashboard}/static/js/plugins/morris/morris.min.js (100%) rename {front/dashboard => dashboard}/static/js/plugins/morris/raphael.min.js (100%) rename {front/dashboard => dashboard}/templates/404.html (100%) rename {front/dashboard => dashboard}/templates/generic.html (100%) rename {front/dashboard => dashboard}/templates/history.html (100%) rename {front/dashboard => dashboard}/templates/index.html (100%) rename {front/dashboard => dashboard}/templates/manage-packages.html (100%) rename {front/dashboard => dashboard}/templates/manage.html (100%) rename {front/dashboard => dashboard}/templates/os-statistics.html (100%) rename {front/dashboard => dashboard}/templates/packages-list.html (100%) rename {front/dashboard => dashboard}/templates/packages.html (100%) rename {front/dashboard => dashboard}/templates/registration/login.html (100%) rename {front/dashboard => dashboard}/templates/server-list.html (100%) rename {front/dashboard => dashboard}/templates/squeleton.html (100%) rename {front/dashboard => dashboard}/tests.py (100%) rename {front/dashboard => dashboard}/urls.py (100%) rename {front/dashboard => dashboard}/views.py (100%) rename {front/defaults => defaults}/gunicorn.service (100%) rename {front/defaults => defaults}/settings_local.py (100%) rename {front/defaults => defaults}/updates-dashboard.conf (100%) delete mode 100644 front/README.md rename front/manage.py => manage.py (100%) rename front/requirements.txt => requirements.txt (100%) rename {front/updatesdashboard => updatesdashboard}/__init__.py (100%) rename {front/updatesdashboard => updatesdashboard}/settings.py (100%) rename {front/updatesdashboard => updatesdashboard}/urls.py (100%) rename {front/updatesdashboard => updatesdashboard}/wsgi.py (100%) diff --git a/README.md b/README.md index 7e6bbd6..009da72 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,63 @@ -# Updates-dashboard +# Updates Dashboard -# Description +## Summary -* Front : Projet Django de consultation/gestion des données -* Ansible : Playbooks ansible de génération des données +This is a tool have a clear view of the which servers are outdated, and keep trace of the updates. + +## Technical information + +It runs with Django. The information are daily generated by an ansible playbook, which is located in ../ansible in this repo. + +## Install + +Dependencies in case of Debian 10. +``` + apt install python3-venv libmariadb-dev-compat libmariadb-dev mariadb-client python3-dev gcc +``` +Following procedure to install the apps. +``` + useradd -d /var/www/updates-dashboard/ -g www-data -M -s /bin/false www-updash + cd /var/www/ + git clone git@gitlab.infolegale.net:infrastructure/updates-dashboard.git updates-dashboard + chown -R www-updash:www-data updates-dashboard + touch /var/log/gunicorn.log + chown www-updash:www-data /var/log/gunicorn.log + cd updates-dashboard + python3 -m venv updash-venv + source updash-venv/bin/activate + (updash-venv) pip install -r requirements.txt + cp defaults/settings_local.py updatesdashboard/ + cp defaults/gunicorn.service /etc/systemd/system/ + cp defaults/updates-dashboard.conf /etc/nginx/sites-available + cd /etc/nginx/sites-enabled + ln -s /etc/nginx/sites-avaiable/updates-dashboard.conf . +``` +* Set `settings_local.py` with correct values +* Set `gunicorn.service` with correct values +* Set `updates-dashboard.conf` with correct values +```shell + systemctl daemon-reload + systemctl enable gunicorn.service + nginx -t + systemctl reload nginx +``` +To initialize the project: +```shell + (updash-venv) ./manage.py makemigrations + (updash-venv) ./manage.py makemigrations dashboard + (updash-venv) ./manage.py collectstatic + (updash-venv) ./manage.py migrate + (updash-venv) ./manage.py loaddata dashboard/fixtures/os.yaml + (updash-venv) ./manage.py loaddata dashboard/fixtures/teams.yaml +``` +Vérifier les flux de mise à jour des données. Ansible->Dashboard +Vérifier le sql mode de la base de données +```shell +set @@global.sql_mode='NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION'; +``` + +## TODO + +* playbook to install via ansible ? +* playbook to update via ansible ? +* buttons should be 'previous / next results' instead of 'previous / next day' diff --git a/ansible/2022-08-17.csv b/ansible/2022-08-17.csv deleted file mode 100644 index ed86e8a..0000000 --- a/ansible/2022-08-17.csv +++ /dev/null @@ -1,19 +0,0 @@ -vlearning-db001-tst.infolegale.net;Debian;10;0;5 -app-db001-tst.infolegale.net;Debian;10;0;9 -consults-db001-tst.infolegale.net;Debian;10;0;147 -vador-db001-tst.infolegale.net;Debian;10;0;147 -tlearning-db003-tst.infolegale.net;Ubuntu;18.04;0;308 -transdb-db001-tst.infolegale.net;Debian;10;0;147 -mysql8-db001-tst.infolegale.net;Debian;11;3;119 -mongo-db001-tst.infolegale.net;Ubuntu;20.04;0;28 -orchestrator-mgr001-tst.infolegale.net;Ubuntu;20.04;0;28 -redis5-db001-tst.infolegale.net;Debian;10;0;326 -redis-db001-tst.infolegale.net;Ubuntu;18.04;0;326 -docker-hpv001-tst.infolegale.net;Ubuntu;20.04;0;106 -docker-hpv002-tst.infolegale.net;Ubuntu;20.04;0;398 -docker-hpv004-tst.infolegale.net;Ubuntu;20.04;0;28 -rundeck-sch001-tst.infolegale.net;Debian;10;0;91 -docker-hpv003-tst.infolegale.net;Ubuntu;20.04;0;125 -proxysql-db001-tst.infolegale.net;Ubuntu;20.04;0;475 -docker-hpv005-tst.infolegale.net;Ubuntu;20.04;0;119 -docker-hpv006-tst.infolegale.net;Ubuntu;20.04;0;309 diff --git a/ansible/README.md b/ansible/README.md deleted file mode 100644 index 0215239..0000000 --- a/ansible/README.md +++ /dev/null @@ -1,22 +0,0 @@ -## Name -Playbooks ansible utilisés pour récupérer les informations à intégrer dans l'updates-dashboard. - -## Description -Les playbooks vont récuperer et afficher les informations suivantes sur les machines : -* Main.yml : hostname, distribution, version, update disponible, uptime. -* Packages.yml : hostname, paquet, version. - -La liste des paquets à vérifier se trouve dans le playbook packages.yml. -Un callback particulier est utilisé pour afficher seulement les informations voulues pour construire le csv. - -## Usage - -* Ajouter callback_plugins=./hooks/ à ansible.cfg -``` -export ANSIBLE_STDOUT_CALLBACK="update_dashboard" -DATE=$(date '+%Y-%m-%d') -ansible-playbook -i hosts-tst playbooks/main.yml > $DATE.csv -``` - -## Authors and acknowledgment -Show your appreciation to those who have contributed to the project. diff --git a/ansible/ansible.cfg b/ansible/ansible.cfg deleted file mode 100644 index 64fe4aa..0000000 --- a/ansible/ansible.cfg +++ /dev/null @@ -1,12 +0,0 @@ -[defaults] -vault_password_file = ~/.vault_password -roles_path = roles -interpreter_python = auto -callback_plugins = ./hooks/ -fact_caching = jsonfile -fact_caching_connection = ~/.cache/ansible/ -deprecation_warnings=False -[hashi_vault_collection] -url = "https://vault.infolegale.net" -token_file = .vault-token -token_validate = None diff --git a/ansible/hooks/__pycache__/update_dashboard.cpython-38.pyc b/ansible/hooks/__pycache__/update_dashboard.cpython-38.pyc deleted file mode 100644 index dac381c6d5887cecaa2fe335796108dd17a6fd29..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1267 zcmaJ>&2AGh5VpNP*|teqXjRIE0}`Mhkw`rufl$+sLPZ)-3rOt6a@J0=&He;?x2RP) zwGYyYQ(uAy@s$&=fH*Kt+BB(9NAkBGd&d6e^JqVnO7jTp+mFAUp9G;_#+f!7oDCT2 zIRHl-M<~WVj)_lV%eOERw(r0?iQKs07chE*xW(;L#BEVHv3!p^d#K|6hHO-^^djr1 zG|DqU!+4m=OnW>$2vwLSx;&I&lF@FS1R3}htcwj6MI9ClHklHEIbqr?a5iA5bpU~U z%#lwx_AO3)n_Ixj=FTbdUGDM%d<(qD=lJ|722KmWsiezS=kKIEk3Qx-=(2S{pcG;+SU7%8^Jj%4y6Pb2K(tv!n5>Z#X<2`?YB`WMh zg2E9ONZtVof9kb<8jG3|omwx=Q<*1;kTgwb zIw+a?JOG4?xQuOl^k7!F>WzdMm5gE&l~%#Ypou^od`8aEDw-%l+DGL_>cyw_ZnNHa zTi~W!P1t*TY9o zZlgbyvlW;pzOtF;zP*q+C}gX?-D*h^9=sE{(1>L&l?8U9@sMuMBW zuBbn}jruseUBO$GIqlJrSd{8{O5;(3!@Nl8*PKO0M(~yz^;T=M-grkpH+T28-?w#X zvhwlEhvt;quJ1IZ5mDYVaNoeS_M@430Ob&?Vq2G8RNkDImFa*|F7Ol=s3!RfEgFf^= 7 - block: - - - name: (Debian) get kernel version - shell: uname -v | awk '{ print $4 }' - register: kernel_version_debian - changed_when: false - - - name: (Debian) Kernel output - debug: msg="{{ inventory_hostname }};kernel;{{ kernel_version_debian.stdout }}" - - ## Ubuntu - - - when: ansible_distribution == "Ubuntu" and ansible_distribution_major_version|int >= 16 - block: - - - name: (Ubuntu) get kernel version - shell: uname -r - register: kernel_version_ubuntu - changed_when: false - - - name: (ubuntu) Kernel output - debug: msg="{{ inventory_hostname }};kernel;{{ kernel_version_ubuntu.stdout }}" diff --git a/ansible/playbooks/packages_include.yml b/ansible/playbooks/packages_include.yml deleted file mode 100644 index 24317d1..0000000 --- a/ansible/playbooks/packages_include.yml +++ /dev/null @@ -1,10 +0,0 @@ ---- - -- name: check package version - shell: dpkg -l | awk '$2=="{{ package }}" { print $3 }' - register: package_version_debian - changed_when: false - -- name: output - debug: msg="{{ inventory_hostname }};{{ package }};{{ package_version_debian.stdout }}" - when: package_version_debian.stdout != "" diff --git a/front/dashboard/__init__.py b/dashboard/__init__.py similarity index 100% rename from front/dashboard/__init__.py rename to dashboard/__init__.py diff --git a/front/dashboard/admin.py b/dashboard/admin.py similarity index 100% rename from front/dashboard/admin.py rename to dashboard/admin.py diff --git a/front/dashboard/apps.py b/dashboard/apps.py similarity index 100% rename from front/dashboard/apps.py rename to dashboard/apps.py diff --git a/front/dashboard/fixtures/os.yaml b/dashboard/fixtures/os.yaml similarity index 100% rename from front/dashboard/fixtures/os.yaml rename to dashboard/fixtures/os.yaml diff --git a/front/dashboard/fixtures/teams.yaml b/dashboard/fixtures/teams.yaml similarity index 100% rename from front/dashboard/fixtures/teams.yaml rename to dashboard/fixtures/teams.yaml diff --git a/front/dashboard/models.py b/dashboard/models.py similarity index 100% rename from front/dashboard/models.py rename to dashboard/models.py diff --git a/front/dashboard/module.py b/dashboard/module.py similarity index 100% rename from front/dashboard/module.py rename to dashboard/module.py diff --git a/front/dashboard/static/css/bootstrap-rtl.css b/dashboard/static/css/bootstrap-rtl.css similarity index 100% rename from front/dashboard/static/css/bootstrap-rtl.css rename to dashboard/static/css/bootstrap-rtl.css diff --git a/front/dashboard/static/css/bootstrap-rtl.min.css b/dashboard/static/css/bootstrap-rtl.min.css similarity index 100% rename from front/dashboard/static/css/bootstrap-rtl.min.css rename to dashboard/static/css/bootstrap-rtl.min.css diff --git a/front/dashboard/static/css/bootstrap.css b/dashboard/static/css/bootstrap.css similarity index 100% rename from front/dashboard/static/css/bootstrap.css rename to dashboard/static/css/bootstrap.css diff --git a/front/dashboard/static/css/bootstrap.min.css b/dashboard/static/css/bootstrap.min.css similarity index 100% rename from front/dashboard/static/css/bootstrap.min.css rename to dashboard/static/css/bootstrap.min.css diff --git a/front/dashboard/static/css/custom.css b/dashboard/static/css/custom.css similarity index 100% rename from front/dashboard/static/css/custom.css rename to dashboard/static/css/custom.css diff --git a/front/dashboard/static/css/datatables.min.css b/dashboard/static/css/datatables.min.css similarity index 100% rename from front/dashboard/static/css/datatables.min.css rename to dashboard/static/css/datatables.min.css diff --git a/front/dashboard/static/css/plugins/morris.css b/dashboard/static/css/plugins/morris.css similarity index 100% rename from front/dashboard/static/css/plugins/morris.css rename to dashboard/static/css/plugins/morris.css diff --git a/front/dashboard/static/css/sb-admin-rtl.css b/dashboard/static/css/sb-admin-rtl.css similarity index 100% rename from front/dashboard/static/css/sb-admin-rtl.css rename to dashboard/static/css/sb-admin-rtl.css diff --git a/front/dashboard/static/css/sb-admin.css b/dashboard/static/css/sb-admin.css similarity index 100% rename from front/dashboard/static/css/sb-admin.css rename to dashboard/static/css/sb-admin.css diff --git a/front/dashboard/static/font-awesome/css/font-awesome.css b/dashboard/static/font-awesome/css/font-awesome.css similarity index 100% rename from front/dashboard/static/font-awesome/css/font-awesome.css rename to dashboard/static/font-awesome/css/font-awesome.css diff --git a/front/dashboard/static/font-awesome/css/font-awesome.min.css b/dashboard/static/font-awesome/css/font-awesome.min.css similarity index 100% rename from front/dashboard/static/font-awesome/css/font-awesome.min.css rename to dashboard/static/font-awesome/css/font-awesome.min.css diff --git a/front/dashboard/static/font-awesome/fonts/FontAwesome.otf b/dashboard/static/font-awesome/fonts/FontAwesome.otf similarity index 100% rename from front/dashboard/static/font-awesome/fonts/FontAwesome.otf rename to dashboard/static/font-awesome/fonts/FontAwesome.otf diff --git a/front/dashboard/static/font-awesome/fonts/fontawesome-webfont.eot b/dashboard/static/font-awesome/fonts/fontawesome-webfont.eot similarity index 100% rename from front/dashboard/static/font-awesome/fonts/fontawesome-webfont.eot rename to dashboard/static/font-awesome/fonts/fontawesome-webfont.eot diff --git a/front/dashboard/static/font-awesome/fonts/fontawesome-webfont.svg b/dashboard/static/font-awesome/fonts/fontawesome-webfont.svg similarity index 100% rename from front/dashboard/static/font-awesome/fonts/fontawesome-webfont.svg rename to dashboard/static/font-awesome/fonts/fontawesome-webfont.svg diff --git a/front/dashboard/static/font-awesome/fonts/fontawesome-webfont.ttf b/dashboard/static/font-awesome/fonts/fontawesome-webfont.ttf similarity index 100% rename from front/dashboard/static/font-awesome/fonts/fontawesome-webfont.ttf rename to dashboard/static/font-awesome/fonts/fontawesome-webfont.ttf diff --git a/front/dashboard/static/font-awesome/fonts/fontawesome-webfont.woff b/dashboard/static/font-awesome/fonts/fontawesome-webfont.woff similarity index 100% rename from front/dashboard/static/font-awesome/fonts/fontawesome-webfont.woff rename to dashboard/static/font-awesome/fonts/fontawesome-webfont.woff diff --git a/front/dashboard/static/font-awesome/less/bordered-pulled.less b/dashboard/static/font-awesome/less/bordered-pulled.less similarity index 100% rename from front/dashboard/static/font-awesome/less/bordered-pulled.less rename to dashboard/static/font-awesome/less/bordered-pulled.less diff --git a/front/dashboard/static/font-awesome/less/core.less b/dashboard/static/font-awesome/less/core.less similarity index 100% rename from front/dashboard/static/font-awesome/less/core.less rename to dashboard/static/font-awesome/less/core.less diff --git a/front/dashboard/static/font-awesome/less/fixed-width.less b/dashboard/static/font-awesome/less/fixed-width.less similarity index 100% rename from front/dashboard/static/font-awesome/less/fixed-width.less rename to dashboard/static/font-awesome/less/fixed-width.less diff --git a/front/dashboard/static/font-awesome/less/font-awesome.less b/dashboard/static/font-awesome/less/font-awesome.less similarity index 100% rename from front/dashboard/static/font-awesome/less/font-awesome.less rename to dashboard/static/font-awesome/less/font-awesome.less diff --git a/front/dashboard/static/font-awesome/less/icons.less b/dashboard/static/font-awesome/less/icons.less similarity index 100% rename from front/dashboard/static/font-awesome/less/icons.less rename to dashboard/static/font-awesome/less/icons.less diff --git a/front/dashboard/static/font-awesome/less/larger.less b/dashboard/static/font-awesome/less/larger.less similarity index 100% rename from front/dashboard/static/font-awesome/less/larger.less rename to dashboard/static/font-awesome/less/larger.less diff --git a/front/dashboard/static/font-awesome/less/list.less b/dashboard/static/font-awesome/less/list.less similarity index 100% rename from front/dashboard/static/font-awesome/less/list.less rename to dashboard/static/font-awesome/less/list.less diff --git a/front/dashboard/static/font-awesome/less/mixins.less b/dashboard/static/font-awesome/less/mixins.less similarity index 100% rename from front/dashboard/static/font-awesome/less/mixins.less rename to dashboard/static/font-awesome/less/mixins.less diff --git a/front/dashboard/static/font-awesome/less/path.less b/dashboard/static/font-awesome/less/path.less similarity index 100% rename from front/dashboard/static/font-awesome/less/path.less rename to dashboard/static/font-awesome/less/path.less diff --git a/front/dashboard/static/font-awesome/less/rotated-flipped.less b/dashboard/static/font-awesome/less/rotated-flipped.less similarity index 100% rename from front/dashboard/static/font-awesome/less/rotated-flipped.less rename to dashboard/static/font-awesome/less/rotated-flipped.less diff --git a/front/dashboard/static/font-awesome/less/spinning.less b/dashboard/static/font-awesome/less/spinning.less similarity index 100% rename from front/dashboard/static/font-awesome/less/spinning.less rename to dashboard/static/font-awesome/less/spinning.less diff --git a/front/dashboard/static/font-awesome/less/stacked.less b/dashboard/static/font-awesome/less/stacked.less similarity index 100% rename from front/dashboard/static/font-awesome/less/stacked.less rename to dashboard/static/font-awesome/less/stacked.less diff --git a/front/dashboard/static/font-awesome/less/variables.less b/dashboard/static/font-awesome/less/variables.less similarity index 100% rename from front/dashboard/static/font-awesome/less/variables.less rename to dashboard/static/font-awesome/less/variables.less diff --git a/front/dashboard/static/font-awesome/scss/_bordered-pulled.scss b/dashboard/static/font-awesome/scss/_bordered-pulled.scss similarity index 100% rename from front/dashboard/static/font-awesome/scss/_bordered-pulled.scss rename to dashboard/static/font-awesome/scss/_bordered-pulled.scss diff --git a/front/dashboard/static/font-awesome/scss/_core.scss b/dashboard/static/font-awesome/scss/_core.scss similarity index 100% rename from front/dashboard/static/font-awesome/scss/_core.scss rename to dashboard/static/font-awesome/scss/_core.scss diff --git a/front/dashboard/static/font-awesome/scss/_fixed-width.scss b/dashboard/static/font-awesome/scss/_fixed-width.scss similarity index 100% rename from front/dashboard/static/font-awesome/scss/_fixed-width.scss rename to dashboard/static/font-awesome/scss/_fixed-width.scss diff --git a/front/dashboard/static/font-awesome/scss/_icons.scss b/dashboard/static/font-awesome/scss/_icons.scss similarity index 100% rename from front/dashboard/static/font-awesome/scss/_icons.scss rename to dashboard/static/font-awesome/scss/_icons.scss diff --git a/front/dashboard/static/font-awesome/scss/_larger.scss b/dashboard/static/font-awesome/scss/_larger.scss similarity index 100% rename from front/dashboard/static/font-awesome/scss/_larger.scss rename to dashboard/static/font-awesome/scss/_larger.scss diff --git a/front/dashboard/static/font-awesome/scss/_list.scss b/dashboard/static/font-awesome/scss/_list.scss similarity index 100% rename from front/dashboard/static/font-awesome/scss/_list.scss rename to dashboard/static/font-awesome/scss/_list.scss diff --git a/front/dashboard/static/font-awesome/scss/_mixins.scss b/dashboard/static/font-awesome/scss/_mixins.scss similarity index 100% rename from front/dashboard/static/font-awesome/scss/_mixins.scss rename to dashboard/static/font-awesome/scss/_mixins.scss diff --git a/front/dashboard/static/font-awesome/scss/_path.scss b/dashboard/static/font-awesome/scss/_path.scss similarity index 100% rename from front/dashboard/static/font-awesome/scss/_path.scss rename to dashboard/static/font-awesome/scss/_path.scss diff --git a/front/dashboard/static/font-awesome/scss/_rotated-flipped.scss b/dashboard/static/font-awesome/scss/_rotated-flipped.scss similarity index 100% rename from front/dashboard/static/font-awesome/scss/_rotated-flipped.scss rename to dashboard/static/font-awesome/scss/_rotated-flipped.scss diff --git a/front/dashboard/static/font-awesome/scss/_spinning.scss b/dashboard/static/font-awesome/scss/_spinning.scss similarity index 100% rename from front/dashboard/static/font-awesome/scss/_spinning.scss rename to dashboard/static/font-awesome/scss/_spinning.scss diff --git a/front/dashboard/static/font-awesome/scss/_stacked.scss b/dashboard/static/font-awesome/scss/_stacked.scss similarity index 100% rename from front/dashboard/static/font-awesome/scss/_stacked.scss rename to dashboard/static/font-awesome/scss/_stacked.scss diff --git a/front/dashboard/static/font-awesome/scss/_variables.scss b/dashboard/static/font-awesome/scss/_variables.scss similarity index 100% rename from front/dashboard/static/font-awesome/scss/_variables.scss rename to dashboard/static/font-awesome/scss/_variables.scss diff --git a/front/dashboard/static/font-awesome/scss/font-awesome.scss b/dashboard/static/font-awesome/scss/font-awesome.scss similarity index 100% rename from front/dashboard/static/font-awesome/scss/font-awesome.scss rename to dashboard/static/font-awesome/scss/font-awesome.scss diff --git a/front/dashboard/static/fonts/glyphicons-halflings-regular.eot b/dashboard/static/fonts/glyphicons-halflings-regular.eot similarity index 100% rename from front/dashboard/static/fonts/glyphicons-halflings-regular.eot rename to dashboard/static/fonts/glyphicons-halflings-regular.eot diff --git a/front/dashboard/static/fonts/glyphicons-halflings-regular.svg b/dashboard/static/fonts/glyphicons-halflings-regular.svg similarity index 100% rename from front/dashboard/static/fonts/glyphicons-halflings-regular.svg rename to dashboard/static/fonts/glyphicons-halflings-regular.svg diff --git a/front/dashboard/static/fonts/glyphicons-halflings-regular.ttf b/dashboard/static/fonts/glyphicons-halflings-regular.ttf similarity index 100% rename from front/dashboard/static/fonts/glyphicons-halflings-regular.ttf rename to dashboard/static/fonts/glyphicons-halflings-regular.ttf diff --git a/front/dashboard/static/fonts/glyphicons-halflings-regular.woff b/dashboard/static/fonts/glyphicons-halflings-regular.woff similarity index 100% rename from front/dashboard/static/fonts/glyphicons-halflings-regular.woff rename to dashboard/static/fonts/glyphicons-halflings-regular.woff diff --git a/front/dashboard/static/fonts/glyphicons-halflings-regular.woff2 b/dashboard/static/fonts/glyphicons-halflings-regular.woff2 similarity index 100% rename from front/dashboard/static/fonts/glyphicons-halflings-regular.woff2 rename to dashboard/static/fonts/glyphicons-halflings-regular.woff2 diff --git a/front/dashboard/static/images/favicon.ico b/dashboard/static/images/favicon.ico similarity index 100% rename from front/dashboard/static/images/favicon.ico rename to dashboard/static/images/favicon.ico diff --git a/front/dashboard/static/js/bootstrap.js b/dashboard/static/js/bootstrap.js similarity index 100% rename from front/dashboard/static/js/bootstrap.js rename to dashboard/static/js/bootstrap.js diff --git a/front/dashboard/static/js/bootstrap.min.js b/dashboard/static/js/bootstrap.min.js similarity index 100% rename from front/dashboard/static/js/bootstrap.min.js rename to dashboard/static/js/bootstrap.min.js diff --git a/front/dashboard/static/js/datatables.min.js b/dashboard/static/js/datatables.min.js similarity index 100% rename from front/dashboard/static/js/datatables.min.js rename to dashboard/static/js/datatables.min.js diff --git a/front/dashboard/static/js/html-to-csv.js b/dashboard/static/js/html-to-csv.js similarity index 100% rename from front/dashboard/static/js/html-to-csv.js rename to dashboard/static/js/html-to-csv.js diff --git a/front/dashboard/static/js/jquery.js b/dashboard/static/js/jquery.js similarity index 100% rename from front/dashboard/static/js/jquery.js rename to dashboard/static/js/jquery.js diff --git a/front/dashboard/static/js/plugins/flot/excanvas.min.js b/dashboard/static/js/plugins/flot/excanvas.min.js similarity index 100% rename from front/dashboard/static/js/plugins/flot/excanvas.min.js rename to dashboard/static/js/plugins/flot/excanvas.min.js diff --git a/front/dashboard/static/js/plugins/flot/flot-data.js b/dashboard/static/js/plugins/flot/flot-data.js similarity index 100% rename from front/dashboard/static/js/plugins/flot/flot-data.js rename to dashboard/static/js/plugins/flot/flot-data.js diff --git a/front/dashboard/static/js/plugins/flot/jquery.flot.js b/dashboard/static/js/plugins/flot/jquery.flot.js similarity index 100% rename from front/dashboard/static/js/plugins/flot/jquery.flot.js rename to dashboard/static/js/plugins/flot/jquery.flot.js diff --git a/front/dashboard/static/js/plugins/flot/jquery.flot.pie.js b/dashboard/static/js/plugins/flot/jquery.flot.pie.js similarity index 100% rename from front/dashboard/static/js/plugins/flot/jquery.flot.pie.js rename to dashboard/static/js/plugins/flot/jquery.flot.pie.js diff --git a/front/dashboard/static/js/plugins/flot/jquery.flot.resize.js b/dashboard/static/js/plugins/flot/jquery.flot.resize.js similarity index 100% rename from front/dashboard/static/js/plugins/flot/jquery.flot.resize.js rename to dashboard/static/js/plugins/flot/jquery.flot.resize.js diff --git a/front/dashboard/static/js/plugins/flot/jquery.flot.tooltip.min.js b/dashboard/static/js/plugins/flot/jquery.flot.tooltip.min.js similarity index 100% rename from front/dashboard/static/js/plugins/flot/jquery.flot.tooltip.min.js rename to dashboard/static/js/plugins/flot/jquery.flot.tooltip.min.js diff --git a/front/dashboard/static/js/plugins/morris/morris-data.js b/dashboard/static/js/plugins/morris/morris-data.js similarity index 100% rename from front/dashboard/static/js/plugins/morris/morris-data.js rename to dashboard/static/js/plugins/morris/morris-data.js diff --git a/front/dashboard/static/js/plugins/morris/morris.js b/dashboard/static/js/plugins/morris/morris.js similarity index 100% rename from front/dashboard/static/js/plugins/morris/morris.js rename to dashboard/static/js/plugins/morris/morris.js diff --git a/front/dashboard/static/js/plugins/morris/morris.min.js b/dashboard/static/js/plugins/morris/morris.min.js similarity index 100% rename from front/dashboard/static/js/plugins/morris/morris.min.js rename to dashboard/static/js/plugins/morris/morris.min.js diff --git a/front/dashboard/static/js/plugins/morris/raphael.min.js b/dashboard/static/js/plugins/morris/raphael.min.js similarity index 100% rename from front/dashboard/static/js/plugins/morris/raphael.min.js rename to dashboard/static/js/plugins/morris/raphael.min.js diff --git a/front/dashboard/templates/404.html b/dashboard/templates/404.html similarity index 100% rename from front/dashboard/templates/404.html rename to dashboard/templates/404.html diff --git a/front/dashboard/templates/generic.html b/dashboard/templates/generic.html similarity index 100% rename from front/dashboard/templates/generic.html rename to dashboard/templates/generic.html diff --git a/front/dashboard/templates/history.html b/dashboard/templates/history.html similarity index 100% rename from front/dashboard/templates/history.html rename to dashboard/templates/history.html diff --git a/front/dashboard/templates/index.html b/dashboard/templates/index.html similarity index 100% rename from front/dashboard/templates/index.html rename to dashboard/templates/index.html diff --git a/front/dashboard/templates/manage-packages.html b/dashboard/templates/manage-packages.html similarity index 100% rename from front/dashboard/templates/manage-packages.html rename to dashboard/templates/manage-packages.html diff --git a/front/dashboard/templates/manage.html b/dashboard/templates/manage.html similarity index 100% rename from front/dashboard/templates/manage.html rename to dashboard/templates/manage.html diff --git a/front/dashboard/templates/os-statistics.html b/dashboard/templates/os-statistics.html similarity index 100% rename from front/dashboard/templates/os-statistics.html rename to dashboard/templates/os-statistics.html diff --git a/front/dashboard/templates/packages-list.html b/dashboard/templates/packages-list.html similarity index 100% rename from front/dashboard/templates/packages-list.html rename to dashboard/templates/packages-list.html diff --git a/front/dashboard/templates/packages.html b/dashboard/templates/packages.html similarity index 100% rename from front/dashboard/templates/packages.html rename to dashboard/templates/packages.html diff --git a/front/dashboard/templates/registration/login.html b/dashboard/templates/registration/login.html similarity index 100% rename from front/dashboard/templates/registration/login.html rename to dashboard/templates/registration/login.html diff --git a/front/dashboard/templates/server-list.html b/dashboard/templates/server-list.html similarity index 100% rename from front/dashboard/templates/server-list.html rename to dashboard/templates/server-list.html diff --git a/front/dashboard/templates/squeleton.html b/dashboard/templates/squeleton.html similarity index 100% rename from front/dashboard/templates/squeleton.html rename to dashboard/templates/squeleton.html diff --git a/front/dashboard/tests.py b/dashboard/tests.py similarity index 100% rename from front/dashboard/tests.py rename to dashboard/tests.py diff --git a/front/dashboard/urls.py b/dashboard/urls.py similarity index 100% rename from front/dashboard/urls.py rename to dashboard/urls.py diff --git a/front/dashboard/views.py b/dashboard/views.py similarity index 100% rename from front/dashboard/views.py rename to dashboard/views.py diff --git a/front/defaults/gunicorn.service b/defaults/gunicorn.service similarity index 100% rename from front/defaults/gunicorn.service rename to defaults/gunicorn.service diff --git a/front/defaults/settings_local.py b/defaults/settings_local.py similarity index 100% rename from front/defaults/settings_local.py rename to defaults/settings_local.py diff --git a/front/defaults/updates-dashboard.conf b/defaults/updates-dashboard.conf similarity index 100% rename from front/defaults/updates-dashboard.conf rename to defaults/updates-dashboard.conf diff --git a/front/README.md b/front/README.md deleted file mode 100644 index 009da72..0000000 --- a/front/README.md +++ /dev/null @@ -1,63 +0,0 @@ -# Updates Dashboard - -## Summary - -This is a tool have a clear view of the which servers are outdated, and keep trace of the updates. - -## Technical information - -It runs with Django. The information are daily generated by an ansible playbook, which is located in ../ansible in this repo. - -## Install - -Dependencies in case of Debian 10. -``` - apt install python3-venv libmariadb-dev-compat libmariadb-dev mariadb-client python3-dev gcc -``` -Following procedure to install the apps. -``` - useradd -d /var/www/updates-dashboard/ -g www-data -M -s /bin/false www-updash - cd /var/www/ - git clone git@gitlab.infolegale.net:infrastructure/updates-dashboard.git updates-dashboard - chown -R www-updash:www-data updates-dashboard - touch /var/log/gunicorn.log - chown www-updash:www-data /var/log/gunicorn.log - cd updates-dashboard - python3 -m venv updash-venv - source updash-venv/bin/activate - (updash-venv) pip install -r requirements.txt - cp defaults/settings_local.py updatesdashboard/ - cp defaults/gunicorn.service /etc/systemd/system/ - cp defaults/updates-dashboard.conf /etc/nginx/sites-available - cd /etc/nginx/sites-enabled - ln -s /etc/nginx/sites-avaiable/updates-dashboard.conf . -``` -* Set `settings_local.py` with correct values -* Set `gunicorn.service` with correct values -* Set `updates-dashboard.conf` with correct values -```shell - systemctl daemon-reload - systemctl enable gunicorn.service - nginx -t - systemctl reload nginx -``` -To initialize the project: -```shell - (updash-venv) ./manage.py makemigrations - (updash-venv) ./manage.py makemigrations dashboard - (updash-venv) ./manage.py collectstatic - (updash-venv) ./manage.py migrate - (updash-venv) ./manage.py loaddata dashboard/fixtures/os.yaml - (updash-venv) ./manage.py loaddata dashboard/fixtures/teams.yaml -``` -Vérifier les flux de mise à jour des données. Ansible->Dashboard -Vérifier le sql mode de la base de données -```shell -set @@global.sql_mode='NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION'; -``` - -## TODO - -* playbook to install via ansible ? -* playbook to update via ansible ? -* buttons should be 'previous / next results' instead of 'previous / next day' diff --git a/front/manage.py b/manage.py similarity index 100% rename from front/manage.py rename to manage.py diff --git a/front/requirements.txt b/requirements.txt similarity index 100% rename from front/requirements.txt rename to requirements.txt diff --git a/front/updatesdashboard/__init__.py b/updatesdashboard/__init__.py similarity index 100% rename from front/updatesdashboard/__init__.py rename to updatesdashboard/__init__.py diff --git a/front/updatesdashboard/settings.py b/updatesdashboard/settings.py similarity index 100% rename from front/updatesdashboard/settings.py rename to updatesdashboard/settings.py diff --git a/front/updatesdashboard/urls.py b/updatesdashboard/urls.py similarity index 100% rename from front/updatesdashboard/urls.py rename to updatesdashboard/urls.py diff --git a/front/updatesdashboard/wsgi.py b/updatesdashboard/wsgi.py similarity index 100% rename from front/updatesdashboard/wsgi.py rename to updatesdashboard/wsgi.py