diff --git a/ansible/provision_proxmox_ct_and_deploy_aw.yml b/ansible/provision_proxmox_ct_and_deploy_aw.yml index 0c08284..2a932a7 100644 --- a/ansible/provision_proxmox_ct_and_deploy_aw.yml +++ b/ansible/provision_proxmox_ct_and_deploy_aw.yml @@ -12,6 +12,9 @@ - aw-server.env.example - aw-ru-patch.js - aw-sw-cleanup.js + - aw-host-groups.json + - settings/classes-worktime.json + - settings/views-default.json tasks: - name: Execute single-CT provisioning workflow diff --git a/ansible/provision_proxmox_ct_matrix_and_deploy_aw.yml b/ansible/provision_proxmox_ct_matrix_and_deploy_aw.yml index d343ad9..b228f66 100644 --- a/ansible/provision_proxmox_ct_matrix_and_deploy_aw.yml +++ b/ansible/provision_proxmox_ct_matrix_and_deploy_aw.yml @@ -12,6 +12,9 @@ - aw-server.env.example - aw-ru-patch.js - aw-sw-cleanup.js + - aw-host-groups.json + - settings/classes-worktime.json + - settings/views-default.json tasks: - name: Validate CT matrix is provided diff --git a/aw-server/apply_webui_ru_patch.sh b/aw-server/apply_webui_ru_patch.sh index d35c71e..2d37b7b 100755 --- a/aw-server/apply_webui_ru_patch.sh +++ b/aw-server/apply_webui_ru_patch.sh @@ -9,13 +9,16 @@ fi source "$ENV_FILE" -WEBUI_DIR="${AW_SERVER_WEBUI_DIR:-/opt/activitywatch/webui-ru}" +WEBUI_DIR="${AW_SERVER_WEBUI_DIR:-${AW_WEBUI_DIR:-/opt/activitywatch/webui-ru}}" PATCH_JS_SRC="/root/bootstrap/aw-ru-patch.js" SW_CLEANUP_SRC="/root/bootstrap/aw-sw-cleanup.js" HOST_GROUPS_SRC="/root/bootstrap/aw-host-groups.json" INDEX_HTML="$WEBUI_DIR/index.html" SERVICE_WORKER="$WEBUI_DIR/service-worker.js" TS=$(date +%Y%m%d%H%M%S) +PATCH_TARGET="$WEBUI_DIR/js/ru-patch-v5.js" +SW_TARGET="$WEBUI_DIR/js/sw-cleanup.js" +HOST_GROUPS_TARGET="$WEBUI_DIR/js/aw-host-groups.json" TRENDS_NEEDLE='this.activityStore.query_category_time_by_period(r)' TRENDS_REPLACEMENT='this.activityStore.ensure_loaded(r)' TIMESPIRAL_NEEDLE='start:new Date("2022-08-08")' @@ -27,14 +30,17 @@ TIMESPIRAL_REPLACEMENT='start:new Date(Date.now()-12*36e5)' [[ -f "$INDEX_HTML" ]] || { echo "missing $INDEX_HTML" >&2; exit 1; } install -d "$WEBUI_DIR/js" -install -m 0644 "$PATCH_JS_SRC" "$WEBUI_DIR/js/aw-ru-patch.js" -install -m 0644 "$SW_CLEANUP_SRC" "$WEBUI_DIR/js/aw-sw-cleanup.js" -install -m 0644 "$HOST_GROUPS_SRC" "$WEBUI_DIR/js/aw-host-groups.json" +install -m 0644 "$PATCH_JS_SRC" "$PATCH_TARGET" +install -m 0644 "$SW_CLEANUP_SRC" "$SW_TARGET" +install -m 0644 "$HOST_GROUPS_SRC" "$HOST_GROUPS_TARGET" cp "$INDEX_HTML" "$INDEX_HTML.bak.$TS" -sed -i '/aw-ru-patch.js/d;/aw-sw-cleanup.js/d' "$INDEX_HTML" -sed -i 's###' "$INDEX_HTML" -sed -i 's###' "$INDEX_HTML" +patch_hash="$(sha1sum "$PATCH_TARGET" | awk '{print substr($1,1,12)}')" +sw_hash="$(sha1sum "$SW_TARGET" | awk '{print substr($1,1,12)}')" + +sed -i '/ru-patch-v5.js/d;/sw-cleanup.js/d;/aw-ru-patch.js/d;/aw-sw-cleanup.js/d' "$INDEX_HTML" +sed -i "s###" "$INDEX_HTML" +sed -i "s###" "$INDEX_HTML" cp "$SW_CLEANUP_SRC" "$SERVICE_WORKER" trends_chunk="$(grep -Rsl "$TRENDS_NEEDLE" "$WEBUI_DIR/js"/*.js 2>/dev/null | head -n 1 || true)" @@ -79,4 +85,4 @@ else echo "Timespiral hotfix skipped: chunk not found" fi -echo "RU patch applied to $WEBUI_DIR" +echo "RU patch applied to $WEBUI_DIR (ru-patch-v5.js?v=$patch_hash)" diff --git a/aw-server/install_aw_server.sh b/aw-server/install_aw_server.sh index fa2dc58..4d6262e 100755 --- a/aw-server/install_aw_server.sh +++ b/aw-server/install_aw_server.sh @@ -21,6 +21,10 @@ required_vars=( AW_SERVER_GROUP ) +BOOTSTRAP_DIR="/root/bootstrap" +VIEWS_JSON="$BOOTSTRAP_DIR/settings/views-default.json" +CLASSES_JSON="$BOOTSTRAP_DIR/settings/classes-worktime.json" + for var_name in "${required_vars[@]}"; do if [[ -z "${!var_name:-}" ]]; then echo "missing required variable: $var_name" >&2 @@ -84,3 +88,30 @@ systemctl daemon-reload systemctl enable activitywatch-server.service systemctl restart activitywatch-server.service systemctl --no-pager --full status activitywatch-server.service || true + +for _ in $(seq 1 20); do + if curl -fsS "http://127.0.0.1:${AW_SERVER_PORT}/api/0/info" >/dev/null 2>&1; then + break + fi + sleep 2 +done + +if [[ -f "$CLASSES_JSON" ]]; then + curl -fsS -X POST \ + -H 'Content-Type: application/json' \ + --data-binary @"$CLASSES_JSON" \ + "http://127.0.0.1:${AW_SERVER_PORT}/api/0/settings/classes" >/dev/null + echo "Applied worktime classes from $CLASSES_JSON" +else + echo "Worktime classes bootstrap not found, skipped: $CLASSES_JSON" +fi + +if [[ -f "$VIEWS_JSON" ]]; then + curl -fsS -X POST \ + -H 'Content-Type: application/json' \ + --data-binary @"$VIEWS_JSON" \ + "http://127.0.0.1:${AW_SERVER_PORT}/api/0/settings/views" >/dev/null + echo "Applied baseline views from $VIEWS_JSON" +else + echo "Views bootstrap not found, skipped: $VIEWS_JSON" +fi diff --git a/install-kit-awindows-20260427-211240.tar.gz b/install-kit-awindows-20260427-211240.tar.gz index 278a3e1..7c7680f 100644 Binary files a/install-kit-awindows-20260427-211240.tar.gz and b/install-kit-awindows-20260427-211240.tar.gz differ diff --git a/install-kit-awindows-20260427-211240.zip b/install-kit-awindows-20260427-211240.zip index 3636b84..0b33d23 100644 Binary files a/install-kit-awindows-20260427-211240.zip and b/install-kit-awindows-20260427-211240.zip differ diff --git a/install-kit-awindows-20260427-211240/MANIFEST.txt b/install-kit-awindows-20260427-211240/MANIFEST.txt index 9569ca6..7513f6f 100644 --- a/install-kit-awindows-20260427-211240/MANIFEST.txt +++ b/install-kit-awindows-20260427-211240/MANIFEST.txt @@ -1,28 +1,37 @@ -KIT_DIR=install-kit-awindows-20260427-211240 -CREATED_AT=2026-04-27T21:14:11+03:00 - -FILES: -/home/igor/tmp/AWatch-rus/install-kit-awindows-20260427-211240/MANIFEST.txt -/home/igor/tmp/AWatch-rus/install-kit-awindows-20260427-211240/README-INSTALL-KIT.txt -/home/igor/tmp/AWatch-rus/install-kit-awindows-20260427-211240/ansible/README.md -/home/igor/tmp/AWatch-rus/install-kit-awindows-20260427-211240/ansible/deploy_aw_windows_phase2.yml -/home/igor/tmp/AWatch-rus/install-kit-awindows-20260427-211240/ansible/windows.example.yml -/home/igor/tmp/AWatch-rus/install-kit-awindows-20260427-211240/server-configs-192.168.100.21/phase2-admin.deployment-config.json -/home/igor/tmp/AWatch-rus/install-kit-awindows-20260427-211240/server-configs-192.168.100.21/phase2-u2u5.deployment-config.json -/home/igor/tmp/AWatch-rus/install-kit-awindows-20260427-211240/server-configs-192.168.100.21/phase2-user1.deployment-config.json -/home/igor/tmp/AWatch-rus/install-kit-awindows-20260427-211240/windows/ActivityWatch.Windows.Common.psd1 -/home/igor/tmp/AWatch-rus/install-kit-awindows-20260427-211240/windows/ActivityWatch.Windows.Common.psm1 -/home/igor/tmp/AWatch-rus/install-kit-awindows-20260427-211240/windows/browser-domains-native-collector.ps1 -/home/igor/tmp/AWatch-rus/install-kit-awindows-20260427-211240/windows/deploy-domain-users.ps1 -/home/igor/tmp/AWatch-rus/install-kit-awindows-20260427-211240/windows/deploy-ensemble.ps1 -/home/igor/tmp/AWatch-rus/install-kit-awindows-20260427-211240/windows/deploy-single-user.ps1 -/home/igor/tmp/AWatch-rus/install-kit-awindows-20260427-211240/windows/dlp-endpoint-signals-collector.ps1 -/home/igor/tmp/AWatch-rus/install-kit-awindows-20260427-211240/windows/dlp-policy.example.json -/home/igor/tmp/AWatch-rus/install-kit-awindows-20260427-211240/windows/hardening-recovery.ps1 -/home/igor/tmp/AWatch-rus/install-kit-awindows-20260427-211240/windows/validate-deployment.ps1 -/home/igor/tmp/AWatch-rus/install-kit-awindows-20260427-211240/windows/web-category-rules.example.json - - -SHA256: -40bdf651a876f1f545c06c9191ff5d9ec3ca1ce75d3edf1d647e3e2fbafece52 /home/igor/tmp/AWatch-rus/install-kit-awindows-20260427-211240.tar.gz -e7e020bff342070d55d2489d9a5e40822543a518863a97cd46865ccf00f64399 /home/igor/tmp/AWatch-rus/install-kit-awindows-20260427-211240.zip +6e1f304f468d77f12df67face6afaaca5bbcfb1496f43df4e4fa0557cf847829 install-kit-awindows-20260427-211240/README-INSTALL-KIT.txt +a11f41827769be915f73d0de2c5503b05f61ccf56f70a50845771bcb79c5ebb7 install-kit-awindows-20260427-211240/ansible/README.md +02ca96f5ecc6abf89ab3271bd08add5795dbba2281168f158d96166f557e33f0 install-kit-awindows-20260427-211240/ansible/deploy_aw_pfsense_poller.yml +7c1ad9363412e802f4272f2e91a1d9f26be722eaf22e654c0a2512b0cebbbfd0 install-kit-awindows-20260427-211240/ansible/deploy_aw_server.yml +d5c42e6fe49c14a0769517ff28184139e467d40f22d4a632630c42ed1ff34ce5 install-kit-awindows-20260427-211240/ansible/deploy_aw_windows_phase2.yml +bc791462b9c00adc8c68ed81e2a7697c560bdbc46f156b4840c7bca1dee2157d install-kit-awindows-20260427-211240/ansible/group_vars/all.example.yml +95696c243ab331f06e77a40a9800c4b6668de77675ebbdf2ef54ae49e1b18874 install-kit-awindows-20260427-211240/ansible/group_vars/pfsense-poller.example.yml +c5cab36645065815571c99f6d360f910dcccbb54b780c8bfd526a6cdc3684e19 install-kit-awindows-20260427-211240/ansible/group_vars/proxmox-matrix.example.yml +35a33c8a1c75ded5e85c6b79e0b3efde07959ff61ee5f66d83b7e0c2abe87fc5 install-kit-awindows-20260427-211240/ansible/group_vars/proxmox.example.yml +69368b7adb7711fa81304866373e61ed464bcc23a08e4509fa54655b05f95790 install-kit-awindows-20260427-211240/ansible/group_vars/windows.example.yml +00064ce5187569fb3221ddd45c2ad7eb37cd50b2a0a832ddf7843e4ff461849a install-kit-awindows-20260427-211240/ansible/inventory.example.ini +bbef175cb77dd53aa07452dbb2fe8797f38b58f42372005c3404c8dc9d6f8e13 install-kit-awindows-20260427-211240/ansible/provision_proxmox_ct_and_deploy_aw.yml +b8f8b6bc504a51cd87db3f46c35a27295b395ea516533068f96af35f8b720434 install-kit-awindows-20260427-211240/ansible/provision_proxmox_ct_matrix_and_deploy_aw.yml +d35bc97b6de18f0006cbbad4adf8a8a5db8ed912997d8fc47c7f11fa9247e907 install-kit-awindows-20260427-211240/ansible/tasks/provision_ct_and_deploy_aw.yml +a50dbadbf619342c2178e255b68f69a36503756daf80eedd9170311c63964f2e install-kit-awindows-20260427-211240/aw-server/activitywatch-server.service +1ef77d865937a8fac15e47fd95b046fc713306f7e0b5a386a9dadd1d4c6ad0be install-kit-awindows-20260427-211240/aw-server/apply_webui_ru_patch.sh +07d4e583f6e9757a11f01558e1f15cfd73c4d82695f1768204f2f50621712168 install-kit-awindows-20260427-211240/aw-server/aw-host-groups.json +76d9d3f3b1984fb2d668bc3bab6bb2a6300c0e5e2cae1b123da7237ca13484e3 install-kit-awindows-20260427-211240/aw-server/aw-ru-patch.js +7c5952f8f0a8590e849ea8381bfcd7059b138250bca8551bd5625f395eb66cd8 install-kit-awindows-20260427-211240/aw-server/aw-server.env.example +98c0bed353bbda0fa7a69df23f3b008cb0e8e70cdff6cc63330d4caf79fd3280 install-kit-awindows-20260427-211240/aw-server/aw-sw-cleanup.js +dce731fdfdcfd773c154d12dbd6b9e621a0bff17ced5a05a65f0fdcb1adcb70f install-kit-awindows-20260427-211240/aw-server/install_aw_server.sh +1856e9f44636030b0cb9ece37ba2a0618eb5187fa82c7969976c1bb5f10fc622 install-kit-awindows-20260427-211240/aw-server/settings/classes-worktime.json +ff07b90cb6a7f09b27d522307cf55b0359e136a2e695190b8564e859f14f9204 install-kit-awindows-20260427-211240/aw-server/settings/views-default.json +59307d284caa74eb3dc129765f9db93b6e8dfd5b1d960b98f347a332b23f82dc install-kit-awindows-20260427-211240/server-configs-192.168.100.21/phase2-admin.deployment-config.json +f2cee1872bf274f15dcfb8fb595fb20a11d228a4bae0930dc6cb918a6f800756 install-kit-awindows-20260427-211240/server-configs-192.168.100.21/phase2-u2u5.deployment-config.json +6aefedcdac8c1d3823c9f4065b051a67a221a3e9424c913a673667b2a23ea1e7 install-kit-awindows-20260427-211240/server-configs-192.168.100.21/phase2-user1.deployment-config.json +33aa34b89246d6c079ef9afe2f5cd153bd9d5946b69a175ff6fd678c77f61da5 install-kit-awindows-20260427-211240/windows/ActivityWatch.Windows.Common.psd1 +d506614168227fa01fa481289079b432b6d8846d5ee8961cff8c21fd0bf7ea8f install-kit-awindows-20260427-211240/windows/ActivityWatch.Windows.Common.psm1 +2a0b94ddad43a6bc684037243e636a54c168d8d4ad25b29778c4d78180da2532 install-kit-awindows-20260427-211240/windows/browser-domains-native-collector.ps1 +98bfcf5dca972f1ba1845bbca546133c192824ec40dd2e55f4e6d59c24a834d1 install-kit-awindows-20260427-211240/windows/deploy-domain-users.ps1 +a19c2a98e6483eb921457f472d1cf62a76e344f2ef3621f04fafa3d7dc2df353 install-kit-awindows-20260427-211240/windows/deploy-ensemble.ps1 +2542425e02acd8a8b02ed701ca2382cf7ae612be28441d1a10a40e48c6a13ad0 install-kit-awindows-20260427-211240/windows/deploy-single-user.ps1 +a2f963927c8b263a21aaffc0a926a058dcec65a04a5fa57c271d3dbe59f9347c install-kit-awindows-20260427-211240/windows/dlp-endpoint-signals-collector.ps1 +aef0032edd9b1e0c54f7b575664ed511dfc6cb53364e7496cbc95e137678e11a install-kit-awindows-20260427-211240/windows/dlp-policy.example.json +ade74a55ce00d9295f2efa0fd72f987688154c93f1142ce0eb6e982f07271be7 install-kit-awindows-20260427-211240/windows/hardening-recovery.ps1 +88ffe06093ef5f7247bd2b990b0c8f801c706a26dc87725bb1194504fab7e306 install-kit-awindows-20260427-211240/windows/validate-deployment.ps1 +731098681d89b9af6f3872abd586ac3b1faba2d7f9340211e503f52ad0243b3f install-kit-awindows-20260427-211240/windows/web-category-rules.example.json diff --git a/install-kit-awindows-20260427-211240/README-INSTALL-KIT.txt b/install-kit-awindows-20260427-211240/README-INSTALL-KIT.txt index d09d6bb..204ed7a 100644 --- a/install-kit-awindows-20260427-211240/README-INSTALL-KIT.txt +++ b/install-kit-awindows-20260427-211240/README-INSTALL-KIT.txt @@ -2,9 +2,9 @@ ActivityWatch DetMir Windows Install Kit Includes: - windows/* (deploy scripts, collectors, common module, configs/examples) -- ansible/deploy_aw_windows_phase2.yml -- ansible/group_vars/windows.example.yml -- ansible/README.md +- ansible/* (Windows and AW server playbooks, examples, inventory, tasks) +- aw-server/* (server installer, RU patch loader, host groups, default settings) +- server-configs-192.168.100.21/* (working Windows Phase2 config snapshots) Source: - Local project snapshot at build time. diff --git a/install-kit-awindows-20260427-211240/ansible/deploy_aw_pfsense_poller.yml b/install-kit-awindows-20260427-211240/ansible/deploy_aw_pfsense_poller.yml new file mode 100644 index 0000000..3eea27c --- /dev/null +++ b/install-kit-awindows-20260427-211240/ansible/deploy_aw_pfsense_poller.yml @@ -0,0 +1,66 @@ +--- +- name: Deploy pfSense ActivityWatch poller + hosts: aw_pfsense_pollers + become: true + gather_facts: true + + vars: + aw_pfsense_install_root: "/opt/aw-pfsense" + aw_pfsense_config_dir: "/etc/aw-pfsense" + aw_pfsense_service_name: "aw-pfsense-poller.service" + + tasks: + - name: Install required packages + ansible.builtin.apt: + name: + - python3 + state: present + update_cache: true + + - name: Ensure directories exist + ansible.builtin.file: + path: "{{ item }}" + state: directory + mode: "0755" + loop: + - "{{ aw_pfsense_install_root }}" + - "{{ aw_pfsense_config_dir }}" + + - name: Install pfSense poller script + ansible.builtin.copy: + src: "{{ aw_repo_root }}/pfsense/pfsense-aw-poller.py" + dest: "{{ aw_pfsense_install_root }}/pfsense-aw-poller.py" + mode: "0755" + + - name: Install systemd service + ansible.builtin.copy: + src: "{{ aw_repo_root }}/pfsense/pfsense-aw-poller.service" + dest: "/etc/systemd/system/{{ aw_pfsense_service_name }}" + mode: "0644" + notify: + - Reload systemd + + - name: Write pfSense poller config + ansible.builtin.copy: + dest: "{{ aw_pfsense_config_dir }}/poller.json" + mode: "0600" + content: "{{ aw_pfsense_poller_config | to_nice_json }}" + notify: + - Restart pfSense poller + + - name: Enable and start pfSense poller + ansible.builtin.systemd: + name: "{{ aw_pfsense_service_name }}" + enabled: true + state: restarted + daemon_reload: true + + handlers: + - name: Reload systemd + ansible.builtin.systemd: + daemon_reload: true + + - name: Restart pfSense poller + ansible.builtin.systemd: + name: "{{ aw_pfsense_service_name }}" + state: restarted diff --git a/install-kit-awindows-20260427-211240/ansible/deploy_aw_server.yml b/install-kit-awindows-20260427-211240/ansible/deploy_aw_server.yml new file mode 100644 index 0000000..d5f7fda --- /dev/null +++ b/install-kit-awindows-20260427-211240/ansible/deploy_aw_server.yml @@ -0,0 +1,229 @@ +--- +- name: Deploy AWatch-rus server + hosts: aw_server + become: true + gather_facts: true + + vars: + aw_release_root: "/opt/activitywatch/releases" + aw_release_dir: "{{ aw_release_root }}/{{ aw_server_version }}" + aw_archive_path: "/tmp/activitywatch-{{ aw_server_version }}.zip" + aw_bootstrap_dir: "/tmp/aw-rus-bootstrap" + aw_ru_patch_cache_bust: "{{ lookup('file', aw_repo_root + '/aw-server/aw-ru-patch.js') | hash('sha1') | truncate(12, true, '') }}" + aw_sw_cleanup_cache_bust: "{{ lookup('file', aw_repo_root + '/aw-server/aw-sw-cleanup.js') | hash('sha1') | truncate(12, true, '') }}" + aw_host_groups_cache_bust: "{{ lookup('file', aw_repo_root + '/aw-server/aw-host-groups.json') | hash('sha1') | truncate(12, true, '') }}" + aw_worktime_classes: "{{ lookup('file', aw_repo_root + '/aw-server/settings/classes-worktime.json') | from_json }}" + aw_default_views: "{{ lookup('file', aw_repo_root + '/aw-server/settings/views-default.json') | from_json }}" + + tasks: + - name: Install base packages + ansible.builtin.apt: + name: + - curl + - unzip + state: present + update_cache: true + + - name: Ensure service account exists + ansible.builtin.user: + name: "{{ aw_server_user }}" + group: "{{ aw_server_group }}" + home: "{{ aw_server_data_dir }}" + shell: /usr/sbin/nologin + system: true + create_home: false + + - name: Ensure required directories + ansible.builtin.file: + path: "{{ item }}" + state: directory + owner: "{{ aw_server_user }}" + group: "{{ aw_server_group }}" + mode: "0755" + loop: + - "{{ aw_release_root }}" + - "{{ aw_release_dir }}" + - "{{ aw_server_webui_dir }}" + - "{{ aw_server_data_dir }}" + - "{{ aw_server_log_dir }}" + - /etc/activitywatch + - "{{ aw_bootstrap_dir }}" + + - name: Download ActivityWatch release archive + ansible.builtin.get_url: + url: "{{ aw_server_download_url }}" + dest: "{{ aw_archive_path }}" + mode: "0644" + + - name: Unpack ActivityWatch release + ansible.builtin.unarchive: + src: "{{ aw_archive_path }}" + dest: "{{ aw_release_dir }}" + remote_src: true + extra_opts: ["-o"] + + - name: Discover extracted AW directory + ansible.builtin.find: + paths: "{{ aw_release_dir }}" + file_type: directory + patterns: "activitywatch*" + register: aw_release_find + + - name: Set release extracted path + ansible.builtin.set_fact: + aw_release_extracted: "{{ (aw_release_find.files | sort(attribute='path') | map(attribute='path') | list | first) }}" + + - name: Verify extracted directory exists + ansible.builtin.assert: + that: + - aw_release_extracted is defined + - aw_release_extracted | length > 0 + fail_msg: "Cannot locate extracted ActivityWatch release directory." + + - name: Sync release content to /opt/activitywatch + ansible.builtin.command: + cmd: "rsync -a --delete {{ aw_release_extracted }}/ /opt/activitywatch/" + + - name: Copy bootstrap files from repository + ansible.builtin.copy: + src: "{{ item.src }}" + dest: "{{ item.dest }}" + mode: "{{ item.mode }}" + loop: + - { src: "{{ aw_repo_root }}/aw-server/activitywatch-server.service", dest: "/etc/systemd/system/activitywatch-server.service", mode: "0644" } + - { src: "{{ aw_repo_root }}/aw-server/aw-ru-patch.js", dest: "{{ aw_server_webui_dir }}/js/ru-patch-v5.js", mode: "0644" } + - { src: "{{ aw_repo_root }}/aw-server/aw-sw-cleanup.js", dest: "{{ aw_server_webui_dir }}/js/sw-cleanup.js", mode: "0644" } + - { src: "{{ aw_repo_root }}/aw-server/aw-host-groups.json", dest: "{{ aw_server_webui_dir }}/js/aw-host-groups.json", mode: "0644" } + notify: + - Reload systemd + - Restart activitywatch + + - name: Copy WebUI index template from installed distribution + ansible.builtin.copy: + remote_src: true + src: "/opt/activitywatch/aw-webui/index.html" + dest: "{{ aw_server_webui_dir }}/index.html" + mode: "0644" + + - name: Insert RU patch scripts into index.html + ansible.builtin.replace: + path: "{{ aw_server_webui_dir }}/index.html" + regexp: '' + replace: '' + + - name: Insert RU patch loader before body end + ansible.builtin.replace: + path: "{{ aw_server_webui_dir }}/index.html" + regexp: '' + replace: '' + + - name: Write /etc/activitywatch/aw-server.env + ansible.builtin.copy: + dest: /etc/activitywatch/aw-server.env + mode: "0640" + content: | + AW_SERVER_HOST={{ aw_server_bind_host }} + AW_SERVER_PORT={{ aw_server_port }} + AW_DATA_DIR={{ aw_server_data_dir }} + AW_LOG_DIR={{ aw_server_log_dir }} + AW_WEBUI_DIR={{ aw_server_webui_dir }} + AW_SERVER_USER={{ aw_server_user }} + AW_SERVER_GROUP={{ aw_server_group }} + + - name: Enable and start service + ansible.builtin.systemd: + name: activitywatch-server.service + enabled: true + state: restarted + daemon_reload: true + + - name: Wait for API + ansible.builtin.uri: + url: "http://127.0.0.1:{{ aw_server_port }}/api/0/info" + method: GET + status_code: 200 + register: aw_api + retries: 10 + delay: 3 + until: aw_api.status == 200 + + - name: Apply baseline worktime settings (classes) + ansible.builtin.uri: + url: "http://127.0.0.1:{{ aw_server_port }}/api/0/settings/classes" + method: POST + body: "{{ aw_worktime_classes }}" + body_format: json + status_code: 201 + when: aw_apply_worktime_settings | default(false) | bool + + - name: Apply baseline views (include DLP and worktime) + ansible.builtin.uri: + url: "http://127.0.0.1:{{ aw_server_port }}/api/0/settings/views" + method: POST + body: "{{ aw_default_views }}" + body_format: json + status_code: 201 + when: aw_apply_worktime_settings | default(false) | bool + + - name: Derive worktime durationDefault from aw_worktime_from/to + ansible.builtin.set_fact: + aw_worktime_from_h: "{{ (aw_worktime_from | default('08:00')).split(':')[0] | int }}" + aw_worktime_from_m: "{{ (aw_worktime_from | default('08:00')).split(':')[1] | int }}" + aw_worktime_to_h: "{{ (aw_worktime_to | default('17:00')).split(':')[0] | int }}" + aw_worktime_to_m: "{{ (aw_worktime_to | default('17:00')).split(':')[1] | int }}" + aw_worktime_duration_default_derived: >- + {{ + ( + ( + ((aw_worktime_to_h | int) * 60 + (aw_worktime_to_m | int)) - + ((aw_worktime_from_h | int) * 60 + (aw_worktime_from_m | int)) + ) * 60 + ) + }} + when: aw_apply_worktime_settings | default(false) | bool + + - name: Normalize derived durationDefault for overnight shifts + ansible.builtin.set_fact: + aw_worktime_duration_default_effective: >- + {{ + (aw_worktime_duration_default_derived | int) + if (aw_worktime_duration_default_derived | int) > 0 + else ((aw_worktime_duration_default_derived | int) + 86400) + }} + when: aw_apply_worktime_settings | default(false) | bool + + - name: Validate derived durationDefault is sane + ansible.builtin.assert: + that: + - aw_worktime_duration_default_effective | int > 0 + - aw_worktime_duration_default_effective | int <= 86400 + fail_msg: "Invalid worktime window: {{ aw_worktime_from }}..{{ aw_worktime_to }}" + when: aw_apply_worktime_settings | default(false) | bool + + - name: Apply baseline worktime period (startOfDay) + ansible.builtin.uri: + url: "http://127.0.0.1:{{ aw_server_port }}/api/0/settings/startOfDay" + method: POST + body: "{{ aw_worktime_start_of_day }}" + body_format: json + status_code: 200 + when: aw_apply_worktime_settings | default(false) | bool + + - name: Apply baseline worktime period (durationDefault seconds) + ansible.builtin.uri: + url: "http://127.0.0.1:{{ aw_server_port }}/api/0/settings/durationDefault" + method: POST + body: "{{ aw_worktime_duration_default_effective }}" + body_format: json + status_code: 200 + when: aw_apply_worktime_settings | default(false) | bool + + handlers: + - name: Reload systemd + ansible.builtin.systemd: + daemon_reload: true + + - name: Restart activitywatch + ansible.builtin.systemd: + name: activitywatch-server.service + state: restarted diff --git a/install-kit-awindows-20260427-211240/ansible/group_vars/all.example.yml b/install-kit-awindows-20260427-211240/ansible/group_vars/all.example.yml new file mode 100644 index 0000000..8a41775 --- /dev/null +++ b/install-kit-awindows-20260427-211240/ansible/group_vars/all.example.yml @@ -0,0 +1,24 @@ +aw_server_version: "v0.13.2" +aw_server_download_url: "https://github.com/ActivityWatch/activitywatch/releases/download/v0.13.2/activitywatch-v0.13.2-linux-x86_64.zip" +aw_server_bind_host: "0.0.0.0" +aw_server_port: 5600 +aw_server_webui_dir: "/opt/activitywatch/webui-ru" +aw_server_data_dir: "/var/lib/activitywatch" +aw_server_log_dir: "/var/log/activitywatch" +aw_server_user: "activitywatch" +aw_server_group: "activitywatch" + +aw_repo_root: "/home/igor/tmp/AWatch-rus" + +# Optional: apply a baseline worktime-focused categorization and views via AW settings API. +# WARNING: this overwrites existing server-side settings/classes/views. +aw_apply_worktime_settings: false + +# Optional defaults for the worktime period in Web UI. +# startOfDay controls day-boundary and default report window start. +# durationDefault controls default time range (seconds) shown in UI. +# +# Recommended: set worktime window explicitly and let the playbook derive duration. +aw_worktime_from: "08:00" +aw_worktime_to: "17:00" +aw_worktime_start_of_day: "{{ aw_worktime_from }}" diff --git a/install-kit-awindows-20260427-211240/ansible/group_vars/pfsense-poller.example.yml b/install-kit-awindows-20260427-211240/ansible/group_vars/pfsense-poller.example.yml new file mode 100644 index 0000000..87aabaa --- /dev/null +++ b/install-kit-awindows-20260427-211240/ansible/group_vars/pfsense-poller.example.yml @@ -0,0 +1,30 @@ +aw_pfsense_poller_config: + poll_interval_seconds: 60 + aw: + server_host: "10.10.10.13" + server_port: 5600 + hostname: "PFSENSE-EDGE01" + pulse_time_seconds: 120 + timeout_seconds: 15 + pfsense: + name: "pfSense Edge 01" + host: "10.10.10.1" + scheme: "https" + verify_tls: false + timeout_seconds: 15 + headers: + X-API-Key: "replace-me" + X-API-Secret: "replace-me" + endpoints: + - name: "system-status" + path: "/api/v2/status/system" + bucket_prefix: "aw-pfsense-health" + bucket_type: "aw.pfsense.health" + - name: "interfaces" + path: "/api/v2/interface" + bucket_prefix: "aw-pfsense-interfaces" + bucket_type: "aw.pfsense.interfaces" + - name: "gateways" + path: "/api/v2/status/gateways" + bucket_prefix: "aw-pfsense-gateways" + bucket_type: "aw.pfsense.gateways" diff --git a/install-kit-awindows-20260427-211240/ansible/group_vars/proxmox-matrix.example.yml b/install-kit-awindows-20260427-211240/ansible/group_vars/proxmox-matrix.example.yml new file mode 100644 index 0000000..ffe4b88 --- /dev/null +++ b/install-kit-awindows-20260427-211240/ansible/group_vars/proxmox-matrix.example.yml @@ -0,0 +1,38 @@ +proxmox_ct_matrix: + - id: "203" + hostname: "activitywatch-user1" + storage: "local-lvm" + template: "local:vztmpl/debian-12-standard_12.7-1_amd64.tar.zst" + rootfs_size: "8G" + cores: "2" + memory: "2048" + swap: "512" + bridge: "vmbr10" + ip: "10.20.30.13/24" + gw: "10.20.30.1" + vlan: "" + nameserver: "1.1.1.1 8.8.8.8" + searchdomain: "example.internal" + password: "CHANGE_ME" + unprivileged: "1" + onboot: "1" + features: "nesting=1,keyctl=1" + + - id: "204" + hostname: "activitywatch-user2" + storage: "local-lvm" + template: "local:vztmpl/debian-12-standard_12.7-1_amd64.tar.zst" + rootfs_size: "8G" + cores: "2" + memory: "2048" + swap: "512" + bridge: "vmbr10" + ip: "10.20.30.14/24" + gw: "10.20.30.1" + vlan: "" + nameserver: "1.1.1.1 8.8.8.8" + searchdomain: "example.internal" + password: "CHANGE_ME" + unprivileged: "1" + onboot: "1" + features: "nesting=1,keyctl=1" diff --git a/install-kit-awindows-20260427-211240/ansible/group_vars/proxmox.example.yml b/install-kit-awindows-20260427-211240/ansible/group_vars/proxmox.example.yml new file mode 100644 index 0000000..07e6eda --- /dev/null +++ b/install-kit-awindows-20260427-211240/ansible/group_vars/proxmox.example.yml @@ -0,0 +1,18 @@ +proxmox_ct_id: "203" +proxmox_ct_hostname: "activitywatch-server" +proxmox_ct_storage: "local-lvm" +proxmox_ct_template: "local:vztmpl/debian-12-standard_12.7-1_amd64.tar.zst" +proxmox_ct_rootfs_size: "8G" +proxmox_ct_cores: "2" +proxmox_ct_memory: "2048" +proxmox_ct_swap: "512" +proxmox_ct_bridge: "vmbr10" +proxmox_ct_ip: "10.20.30.13/24" +proxmox_ct_gw: "10.20.30.1" +proxmox_ct_vlan: "" +proxmox_ct_nameserver: "1.1.1.1 8.8.8.8" +proxmox_ct_searchdomain: "example.internal" +proxmox_ct_password: "CHANGE_ME" +proxmox_ct_unprivileged: "1" +proxmox_ct_onboot: "1" +proxmox_ct_features: "nesting=1,keyctl=1" diff --git a/install-kit-awindows-20260427-211240/ansible/windows.example.yml b/install-kit-awindows-20260427-211240/ansible/group_vars/windows.example.yml similarity index 100% rename from install-kit-awindows-20260427-211240/ansible/windows.example.yml rename to install-kit-awindows-20260427-211240/ansible/group_vars/windows.example.yml diff --git a/install-kit-awindows-20260427-211240/ansible/inventory.example.ini b/install-kit-awindows-20260427-211240/ansible/inventory.example.ini new file mode 100644 index 0000000..f73f446 --- /dev/null +++ b/install-kit-awindows-20260427-211240/ansible/inventory.example.ini @@ -0,0 +1,8 @@ +[proxmox] +pve-main ansible_host=192.168.10.2 ansible_user=root ansible_port=22 + +[aw_server] +aw-ct ansible_host=10.20.30.13 ansible_user=root ansible_port=22 + +[aw_windows] +win-node1 ansible_host=192.168.100.21 ansible_user=Administrator ansible_password=CHANGE_ME ansible_connection=winrm ansible_winrm_transport=ntlm ansible_port=5985 ansible_winrm_server_cert_validation=ignore diff --git a/install-kit-awindows-20260427-211240/ansible/provision_proxmox_ct_and_deploy_aw.yml b/install-kit-awindows-20260427-211240/ansible/provision_proxmox_ct_and_deploy_aw.yml new file mode 100644 index 0000000..2a932a7 --- /dev/null +++ b/install-kit-awindows-20260427-211240/ansible/provision_proxmox_ct_and_deploy_aw.yml @@ -0,0 +1,40 @@ +--- +- name: Provision single Proxmox CT and deploy AWatch-rus + hosts: proxmox + gather_facts: false + + vars: + proxmox_bootstrap_dir: "/tmp/aw-rus-bootstrap" + aw_bootstrap_files: + - install_aw_server.sh + - apply_webui_ru_patch.sh + - activitywatch-server.service + - aw-server.env.example + - aw-ru-patch.js + - aw-sw-cleanup.js + - aw-host-groups.json + - settings/classes-worktime.json + - settings/views-default.json + + tasks: + - name: Execute single-CT provisioning workflow + ansible.builtin.include_tasks: tasks/provision_ct_and_deploy_aw.yml + vars: + ct_id: "{{ proxmox_ct_id }}" + ct_hostname: "{{ proxmox_ct_hostname }}" + ct_storage: "{{ proxmox_ct_storage }}" + ct_template: "{{ proxmox_ct_template }}" + ct_rootfs_size: "{{ proxmox_ct_rootfs_size }}" + ct_cores: "{{ proxmox_ct_cores }}" + ct_memory: "{{ proxmox_ct_memory }}" + ct_swap: "{{ proxmox_ct_swap }}" + ct_bridge: "{{ proxmox_ct_bridge }}" + ct_ip: "{{ proxmox_ct_ip }}" + ct_gw: "{{ proxmox_ct_gw }}" + ct_vlan: "{{ proxmox_ct_vlan | default('') }}" + ct_nameserver: "{{ proxmox_ct_nameserver | default('') }}" + ct_searchdomain: "{{ proxmox_ct_searchdomain | default('') }}" + ct_password: "{{ proxmox_ct_password }}" + ct_unprivileged: "{{ proxmox_ct_unprivileged }}" + ct_onboot: "{{ proxmox_ct_onboot }}" + ct_features: "{{ proxmox_ct_features }}" diff --git a/install-kit-awindows-20260427-211240/ansible/provision_proxmox_ct_matrix_and_deploy_aw.yml b/install-kit-awindows-20260427-211240/ansible/provision_proxmox_ct_matrix_and_deploy_aw.yml new file mode 100644 index 0000000..b228f66 --- /dev/null +++ b/install-kit-awindows-20260427-211240/ansible/provision_proxmox_ct_matrix_and_deploy_aw.yml @@ -0,0 +1,50 @@ +--- +- name: Provision Proxmox CT matrix and deploy AWatch-rus with RU patch + hosts: proxmox + gather_facts: false + + vars: + proxmox_bootstrap_dir: "/tmp/aw-rus-bootstrap" + aw_bootstrap_files: + - install_aw_server.sh + - apply_webui_ru_patch.sh + - activitywatch-server.service + - aw-server.env.example + - aw-ru-patch.js + - aw-sw-cleanup.js + - aw-host-groups.json + - settings/classes-worktime.json + - settings/views-default.json + + tasks: + - name: Validate CT matrix is provided + ansible.builtin.assert: + that: + - proxmox_ct_matrix is defined + - proxmox_ct_matrix | length > 0 + fail_msg: "Define proxmox_ct_matrix in group_vars/proxmox-matrix.yml" + + - name: Execute provisioning workflow for each CT + ansible.builtin.include_tasks: tasks/provision_ct_and_deploy_aw.yml + vars: + ct_id: "{{ item.id }}" + ct_hostname: "{{ item.hostname }}" + ct_storage: "{{ item.storage }}" + ct_template: "{{ item.template }}" + ct_rootfs_size: "{{ item.rootfs_size }}" + ct_cores: "{{ item.cores }}" + ct_memory: "{{ item.memory }}" + ct_swap: "{{ item.swap }}" + ct_bridge: "{{ item.bridge }}" + ct_ip: "{{ item.ip }}" + ct_gw: "{{ item.gw }}" + ct_vlan: "{{ item.vlan | default('') }}" + ct_nameserver: "{{ item.nameserver | default('') }}" + ct_searchdomain: "{{ item.searchdomain | default('') }}" + ct_password: "{{ item.password }}" + ct_unprivileged: "{{ item.unprivileged }}" + ct_onboot: "{{ item.onboot }}" + ct_features: "{{ item.features }}" + loop: "{{ proxmox_ct_matrix }}" + loop_control: + label: "ct={{ item.id }} host={{ item.hostname }} ip={{ item.ip }}" diff --git a/install-kit-awindows-20260427-211240/ansible/tasks/provision_ct_and_deploy_aw.yml b/install-kit-awindows-20260427-211240/ansible/tasks/provision_ct_and_deploy_aw.yml new file mode 100644 index 0000000..4cceb17 --- /dev/null +++ b/install-kit-awindows-20260427-211240/ansible/tasks/provision_ct_and_deploy_aw.yml @@ -0,0 +1,217 @@ +--- +- name: Validate required per-CT variables + ansible.builtin.assert: + that: + - ct_id is defined + - ct_hostname is defined + - ct_storage is defined + - ct_template is defined + - ct_rootfs_size is defined + - ct_cores is defined + - ct_memory is defined + - ct_swap is defined + - ct_bridge is defined + - ct_ip is defined + - ct_gw is defined + - ct_password is defined + - ct_unprivileged is defined + - ct_onboot is defined + - ct_features is defined + - aw_repo_root is defined + - aw_server_version is defined + - aw_server_download_url is defined + - aw_server_bind_host is defined + - aw_server_port is defined + - aw_server_webui_dir is defined + - aw_server_data_dir is defined + - aw_server_log_dir is defined + - aw_server_user is defined + - aw_server_group is defined + fail_msg: "Missing required variables for CT provisioning/deploy." + +- name: Build CT network string + ansible.builtin.set_fact: + ct_net0: >- + name=eth0,bridge={{ ct_bridge }},ip={{ ct_ip }},gw={{ ct_gw }}{% if (ct_vlan | default('') | string | length) > 0 %},tag={{ ct_vlan }}{% endif %} + +- name: Check whether CT already exists + ansible.builtin.command: + argv: + - pct + - status + - "{{ ct_id }}" + register: ct_status_check + failed_when: false + changed_when: false + +- name: Create CT when absent + ansible.builtin.command: + argv: + - pct + - create + - "{{ ct_id }}" + - "{{ ct_template }}" + - --hostname + - "{{ ct_hostname }}" + - --cores + - "{{ ct_cores }}" + - --memory + - "{{ ct_memory }}" + - --swap + - "{{ ct_swap }}" + - --rootfs + - "{{ ct_storage }}:{{ ct_rootfs_size }}" + - --password + - "{{ ct_password }}" + - --unprivileged + - "{{ ct_unprivileged }}" + - --onboot + - "{{ ct_onboot }}" + - --features + - "{{ ct_features }}" + - --net0 + - "{{ ct_net0 }}" + - --nameserver + - "{{ ct_nameserver | default('') }}" + - --searchdomain + - "{{ ct_searchdomain | default('') }}" + - --ostype + - debian + when: ct_status_check.rc != 0 + +- name: Check current CT runtime state + ansible.builtin.command: + argv: + - pct + - status + - "{{ ct_id }}" + register: ct_runtime_status + changed_when: false + +- name: Start CT when stopped + ansible.builtin.command: + argv: + - pct + - start + - "{{ ct_id }}" + when: "'stopped' in ct_runtime_status.stdout" + +- name: Ensure bootstrap directory on Proxmox host + ansible.builtin.file: + path: "{{ proxmox_bootstrap_dir }}" + state: directory + mode: "0700" + +- name: Copy AW bootstrap files to Proxmox host temp + ansible.builtin.copy: + src: "{{ aw_repo_root }}/aw-server/{{ item }}" + dest: "{{ proxmox_bootstrap_dir }}/{{ item }}" + mode: "0644" + loop: "{{ aw_bootstrap_files }}" + +- name: Bootstrap CT OS dependencies + ansible.builtin.command: + argv: + - pct + - exec + - "{{ ct_id }}" + - -- + - bash + - -lc + - | + set -euo pipefail + export DEBIAN_FRONTEND=noninteractive + apt-get update + apt-get install -y curl ca-certificates bash unzip xz-utils jq rsync openssh-server + mkdir -p /root/bootstrap /etc/activitywatch + systemctl enable ssh || true + systemctl restart ssh || true + +- name: Push bootstrap files into CT + ansible.builtin.command: + argv: + - pct + - push + - "{{ ct_id }}" + - "{{ proxmox_bootstrap_dir }}/{{ item }}" + - "/root/bootstrap/{{ item }}" + loop: "{{ aw_bootstrap_files }}" + +- name: Write AW server env file on Proxmox host temp + ansible.builtin.copy: + dest: "{{ proxmox_bootstrap_dir }}/aw-server.env" + mode: "0600" + content: | + AW_SERVER_VERSION={{ aw_server_version }} + AW_SERVER_DOWNLOAD_URL={{ aw_server_download_url }} + AW_SERVER_BIND_HOST={{ aw_server_bind_host }} + AW_SERVER_PORT={{ aw_server_port }} + AW_SERVER_WEBUI_DIR={{ aw_server_webui_dir }} + AW_SERVER_DATA_DIR={{ aw_server_data_dir }} + AW_SERVER_LOG_DIR={{ aw_server_log_dir }} + AW_SERVER_USER={{ aw_server_user }} + AW_SERVER_GROUP={{ aw_server_group }} + +- name: Push AW server env into CT + ansible.builtin.command: + argv: + - pct + - push + - "{{ ct_id }}" + - "{{ proxmox_bootstrap_dir }}/aw-server.env" + - /etc/activitywatch/aw-server.env + +- name: Set mode for env inside CT + ansible.builtin.command: + argv: + - pct + - exec + - "{{ ct_id }}" + - -- + - chmod + - "0600" + - /etc/activitywatch/aw-server.env + +- name: Install server and apply RU patch inside CT + ansible.builtin.command: + argv: + - pct + - exec + - "{{ ct_id }}" + - -- + - bash + - -lc + - | + set -euo pipefail + chmod +x /root/bootstrap/install_aw_server.sh /root/bootstrap/apply_webui_ru_patch.sh + bash /root/bootstrap/install_aw_server.sh + bash /root/bootstrap/apply_webui_ru_patch.sh + systemctl restart activitywatch-server.service + +- name: Validate AW API from inside CT + ansible.builtin.command: + argv: + - pct + - exec + - "{{ ct_id }}" + - -- + - bash + - -lc + - "curl -fsS http://127.0.0.1:{{ aw_server_port }}/api/0/info >/dev/null" + +- name: Validate RU patch hooks in index + ansible.builtin.command: + argv: + - pct + - exec + - "{{ ct_id }}" + - -- + - bash + - -lc + - "grep -q 'ru-patch-v5.js' {{ aw_server_webui_dir }}/index.html && grep -q 'sw-cleanup.js' {{ aw_server_webui_dir }}/index.html" + +- name: Show final endpoint + ansible.builtin.debug: + msg: + - "CT {{ ct_id }} is provisioned and configured." + - "ActivityWatch endpoint: http://{{ ct_ip | regex_replace('/[0-9]+$', '') }}:{{ aw_server_port }}" diff --git a/install-kit-awindows-20260427-211240/aw-server/activitywatch-server.service b/install-kit-awindows-20260427-211240/aw-server/activitywatch-server.service new file mode 100755 index 0000000..e8f26e3 --- /dev/null +++ b/install-kit-awindows-20260427-211240/aw-server/activitywatch-server.service @@ -0,0 +1,24 @@ +[Unit] +Description=ActivityWatch Server (Rust) +After=network-online.target +Wants=network-online.target + +[Service] +Type=simple +EnvironmentFile=/etc/activitywatch/aw-server.env +User=__AW_SERVER_USER__ +Group=__AW_SERVER_GROUP__ +WorkingDirectory=__AW_SERVER_DATA_DIR__ +ExecStart=/bin/sh -lc 'exec /opt/activitywatch/bin/aw-server-rust --host "$AW_SERVER_BIND_HOST" --port "$AW_SERVER_PORT"' +Restart=on-failure +RestartSec=5s +StateDirectory=activitywatch +LogsDirectory=activitywatch +NoNewPrivileges=true +PrivateTmp=true +ProtectSystem=full +ProtectHome=true +LimitNOFILE=65535 + +[Install] +WantedBy=multi-user.target diff --git a/install-kit-awindows-20260427-211240/aw-server/apply_webui_ru_patch.sh b/install-kit-awindows-20260427-211240/aw-server/apply_webui_ru_patch.sh new file mode 100755 index 0000000..2d37b7b --- /dev/null +++ b/install-kit-awindows-20260427-211240/aw-server/apply_webui_ru_patch.sh @@ -0,0 +1,88 @@ +#!/bin/bash +set -euo pipefail + +ENV_FILE="/etc/activitywatch/aw-server.env" +if [[ ! -f "$ENV_FILE" ]]; then + echo "missing env file: $ENV_FILE" >&2 + exit 1 +fi + +source "$ENV_FILE" + +WEBUI_DIR="${AW_SERVER_WEBUI_DIR:-${AW_WEBUI_DIR:-/opt/activitywatch/webui-ru}}" +PATCH_JS_SRC="/root/bootstrap/aw-ru-patch.js" +SW_CLEANUP_SRC="/root/bootstrap/aw-sw-cleanup.js" +HOST_GROUPS_SRC="/root/bootstrap/aw-host-groups.json" +INDEX_HTML="$WEBUI_DIR/index.html" +SERVICE_WORKER="$WEBUI_DIR/service-worker.js" +TS=$(date +%Y%m%d%H%M%S) +PATCH_TARGET="$WEBUI_DIR/js/ru-patch-v5.js" +SW_TARGET="$WEBUI_DIR/js/sw-cleanup.js" +HOST_GROUPS_TARGET="$WEBUI_DIR/js/aw-host-groups.json" +TRENDS_NEEDLE='this.activityStore.query_category_time_by_period(r)' +TRENDS_REPLACEMENT='this.activityStore.ensure_loaded(r)' +TIMESPIRAL_NEEDLE='start:new Date("2022-08-08")' +TIMESPIRAL_REPLACEMENT='start:new Date(Date.now()-12*36e5)' + +[[ -f "$PATCH_JS_SRC" ]] || { echo "missing $PATCH_JS_SRC" >&2; exit 1; } +[[ -f "$SW_CLEANUP_SRC" ]] || { echo "missing $SW_CLEANUP_SRC" >&2; exit 1; } +[[ -f "$HOST_GROUPS_SRC" ]] || { echo "missing $HOST_GROUPS_SRC" >&2; exit 1; } +[[ -f "$INDEX_HTML" ]] || { echo "missing $INDEX_HTML" >&2; exit 1; } + +install -d "$WEBUI_DIR/js" +install -m 0644 "$PATCH_JS_SRC" "$PATCH_TARGET" +install -m 0644 "$SW_CLEANUP_SRC" "$SW_TARGET" +install -m 0644 "$HOST_GROUPS_SRC" "$HOST_GROUPS_TARGET" +cp "$INDEX_HTML" "$INDEX_HTML.bak.$TS" + +patch_hash="$(sha1sum "$PATCH_TARGET" | awk '{print substr($1,1,12)}')" +sw_hash="$(sha1sum "$SW_TARGET" | awk '{print substr($1,1,12)}')" + +sed -i '/ru-patch-v5.js/d;/sw-cleanup.js/d;/aw-ru-patch.js/d;/aw-sw-cleanup.js/d' "$INDEX_HTML" +sed -i "s###" "$INDEX_HTML" +sed -i "s###" "$INDEX_HTML" +cp "$SW_CLEANUP_SRC" "$SERVICE_WORKER" + +trends_chunk="$(grep -Rsl "$TRENDS_NEEDLE" "$WEBUI_DIR/js"/*.js 2>/dev/null | head -n 1 || true)" +if [[ -n "$trends_chunk" ]]; then + cp "$trends_chunk" "$trends_chunk.bak.$TS" + python3 - "$trends_chunk" "$TRENDS_NEEDLE" "$TRENDS_REPLACEMENT" <<'PY' +from pathlib import Path +import sys + +path = Path(sys.argv[1]) +old = sys.argv[2] +new = sys.argv[3] +content = path.read_text() +if old in content: + path.write_text(content.replace(old, new, 1)) + print(f"Trends hotfix applied to {path}") +else: + print(f"Trends hotfix already present in {path}") +PY +else + echo "Trends hotfix skipped: chunk not found" +fi + +timespiral_chunk="$(grep -Rsl "$TIMESPIRAL_NEEDLE" "$WEBUI_DIR/js"/*.js 2>/dev/null | head -n 1 || true)" +if [[ -n "$timespiral_chunk" ]]; then + cp "$timespiral_chunk" "$timespiral_chunk.bak.$TS" + python3 - "$timespiral_chunk" "$TIMESPIRAL_NEEDLE" "$TIMESPIRAL_REPLACEMENT" <<'PY' +from pathlib import Path +import sys + +path = Path(sys.argv[1]) +old = sys.argv[2] +new = sys.argv[3] +content = path.read_text() +if old in content: + path.write_text(content.replace(old, new, 1)) + print(f"Timespiral hotfix applied to {path}") +else: + print(f"Timespiral hotfix already present in {path}") +PY +else + echo "Timespiral hotfix skipped: chunk not found" +fi + +echo "RU patch applied to $WEBUI_DIR (ru-patch-v5.js?v=$patch_hash)" diff --git a/install-kit-awindows-20260427-211240/aw-server/aw-host-groups.json b/install-kit-awindows-20260427-211240/aw-server/aw-host-groups.json new file mode 100644 index 0000000..f3d0118 --- /dev/null +++ b/install-kit-awindows-20260427-211240/aw-server/aw-host-groups.json @@ -0,0 +1,47 @@ +{ + "groups": [ + { + "id": "pve-detmir", + "name": "pve-detmir", + "description": "Выделенный клиент DetMir в разделе Активность.", + "patterns": [ + "^pve-detmir$" + ], + "links": [ + { "label": "Активность", "type": "activity", "view": "pve_audit" }, + { "label": "Web-admin аудит", "type": "bucket", "bucket_prefix": "aw-pve-webadmin-events_" }, + { "label": "PVE tasks", "type": "bucket", "bucket_prefix": "aw-pve-task-events_" }, + { "label": "SSH сессии", "type": "bucket", "bucket_prefix": "aw-ssh-sessions_" }, + { "label": "Команды shell", "type": "bucket", "bucket_prefix": "aw-console-commands_" }, + { "label": "Web категории", "type": "bucket", "bucket_prefix": "aw-detmir-web-category_" }, + { "label": "Все бакеты", "type": "buckets" } + ] + }, + { + "id": "windows-rdp", + "name": "Windows RDP", + "description": "Пользовательские Windows/RDP хосты с активностью, DLP и рабочим временем.", + "patterns": [ + "^(SHARKON|WIN|RDP|TERM|TS-|WS-)" + ], + "links": [ + { "label": "Активность", "type": "activity" }, + { "label": "DLP", "type": "bucket", "bucket_prefix": "aw-dlp-endpoint-signals_" } + ] + }, + { + "id": "virtual-infra", + "name": "Virtual servers + Proxmox", + "description": "Инфраструктурные VM и сетевые узлы. Здесь должны лежать Proxmox, pfSense, Debian и Ubuntu серверы.", + "patterns": [ + "^(PFSENSE|PVE|PROXMOX|DEBIAN|UBUNTU|LINUX|VM-|SRV-|INFRA-)" + ], + "links": [ + { "label": "pfSense health", "type": "bucket", "bucket_prefix": "aw-pfsense-health_" }, + { "label": "pfSense gateways", "type": "bucket", "bucket_prefix": "aw-pfsense-gateways_" }, + { "label": "Все бакеты", "type": "buckets" } + ] + } + ], + "ungrouped_name": "Прочие хосты" +} diff --git a/install-kit-awindows-20260427-211240/aw-server/aw-ru-patch.js b/install-kit-awindows-20260427-211240/aw-server/aw-ru-patch.js new file mode 100755 index 0000000..1052651 --- /dev/null +++ b/install-kit-awindows-20260427-211240/aw-server/aw-ru-patch.js @@ -0,0 +1,1518 @@ +(function () { + window.__awRuPatchVersion = "template-v10-pve-detmir-audit-stable"; + document.documentElement.setAttribute("data-aw-ru-patch", "template-v10-pve-detmir-audit-stable"); + + const exact = new Map([ + ["ActivityWatch", "АктивВотч"], + ["Home", "Главная"], + ["Activity", "Активность"], + ["Developer settings", "Настройки разработчика"], + ["Timeline", "Таймлайн"], + ["Trends", "Тренды"], + ["Report", "Отчеты"], + ["Settings", "Настройки"], + ["Search", "Поиск"], + ["Buckets", "Бакеты"], + ["Stopwatch", "Секундомер"], + ["Timespiral", "Временная спираль"], + ["Categorization helper", "Помощник категоризации"], + ["Categorization", "Категоризация"], + ["Tools", "Инструменты"], + ["Raw Data", "Сырые данные"], + ["Summary", "Сводка"], + ["All", "Все"], + ["None", "Нет"], + ["Date", "Дата"], + ["Time", "Время"], + ["to", "до"], + ["Start of day", "Начало дня"], + ["Start of week", "Начало недели"], + ["Duration default value", "Значение длительности по умолчанию"], + ["Landing page", "Стартовая страница"], + ["Theme", "Тема"], + ["New release notification", "Уведомление о новом релизе"], + ["Use fallback colors", "Использовать резервные цвета"], + ["Always count as active pattern", "Шаблон всегда считать активным"], + ["Hostname", "Имя хоста"], + ["Hostname:", "Имя хоста:"], + ["Range", "Диапазон"], + ["Range:", "Диапазон:"], + ["Options", "Параметры"], + ["Toggles", "Переключатели"], + ["Enabled", "Включено"], + ["Host", "Хост"], + ["Version", "Версия"], + ["day", "день"], + ["week", "неделя"], + ["month", "месяц"], + ["year", "год"], + ["Monday", "Понедельник"], + ["Saturday", "Суббота"], + ["Sunday", "Воскресенье"], + ["Start", "Начало"], + ["Stop", "Конец"], + ["End", "Конец"], + ["Refresh", "Обновить"], + ["Apply", "Применить"], + ["Filters", "Фильтры"], + ["Show options", "Показать параметры"], + ["Show last", "Показать за"], + ["Show from", "Показать с"], + ["Last update", "Последнее обновление"], + ["Events shown", "Показано событий"], + ["Window", "Окно"], + ["New view", "Новый вид"], + ["Edit view", "Изменить вид"], + ["Show percent", "Показать проценты"], + ["Top Window Titles", "Топ заголовков окон"], + ["Download", "Скачать"], + ["Upload", "Загрузить"], + ["Show", "Показать"], + ["Hide", "Скрыть"], + ["Close", "Закрыть"], + ["Week", "Неделя"], + ["Month", "Месяц"], + ["Year", "Год"], + ["Today", "Сегодня"], + ["Yesterday", "Вчера"], + ["No data", "Нет данных"], + ["Category", "Категория"], + ["Categories", "Категории"], + ["Duration", "Длительность"], + ["Applications", "Приложения"], + ["Hosts", "Хосты"], + ["Date Range", "Диапазон дат"], + ["Generate", "Сформировать"], + ["Loading", "Загрузка"], + ["Loading...", "Загрузка..."], + ["Dark", "Темная"], + ["Light", "Светлая"], + ["Save", "Сохранить"], + ["Cancel", "Отмена"], + ["Delete", "Удалить"], + ["API Browser", "API-браузер"], + ["Documentation", "Документация"], + ["Restore defaults", "Восстановить значения по умолчанию"], + ["Import", "Импорт"], + ["Export", "Экспорт"], + ["Category Builder", "Конструктор категорий"], + ["Query Explorer", "Конструктор запросов"], + ["Event List", "Список событий"], + ["Raw JSON", "Сырой JSON"], + ["Expand list", "Развернуть список"], + ["Alerts", "Оповещения"], + ["Graph", "Граф"], + ["Developer zone", "Зона разработчика"], + ["History", "История"], + ["Running", "Запущено"], + ["Edit", "Изменить"], + ["No stopwatch running", "Нет активного секундомера"], + ["No label", "Без метки"], + ["Start new", "Новый запуск"], + ["Check", "Проверить"], + ["Name", "Имя"], + ["New alert", "Новое правило"], + ["Custom regex", "Свое регулярное выражение"], + ["Use existing categories", "Использовать существующие категории"], + ["Choose a tag...", "Выберите тег..."], + ["Rule", "Правило"], + ["Open", "Открыть"], + ["More", "Еще"], + ["Bucket ID", "ID бакета"], + ["Updated", "Обновлено"], + ["First seen", "Впервые замечен"], + ["Last updated", "Последнее обновление"], + ["Toggle navigation", "Переключить навигацию"], + ["unknown", "неизвестно"], + ["Uncategorized", "Без категории"] + ]); + + const partial = [ + ["Hello early user,", "Здравствуйте, ранний пользователь,"], + ["early days for ActivityWatch.", "ранний этап для ActivityWatch."], + ["still early days for ActivityWatch.", "все еще ранний этап для ActivityWatch."], + ["It's still early days for ActivityWatch.", "ActivityWatch еще находится на раннем этапе."], + ["We've come a long way but we need users (like you!) to provide feedback and help us turn ActivityWatch into a successful project.", "Мы уже прошли большой путь, но нам нужны пользователи вроде вас, чтобы давать обратную связь и помогать развивать проект."], + ["Early users like you mean a lot to us, and we hope you'll reach out to us with any ideas you have for improvements!", "Такие ранние пользователи очень важны, и мы рассчитываем на ваши идеи по улучшению системы."], + ["If you have a minute, we'd really appreciate you taking our short user survey!", "Если у вас есть минута, пожалуйста, пройдите наш короткий опрос пользователей."], + ["If you have a minute to spare, please take the time to fill out our user survey, vote on features in the forum, or just share ActivityWatch with your friends and colleagues.", "Если у вас есть немного времени, пожалуйста, заполните наш пользовательский опрос, проголосуйте за функции на форуме или просто расскажите об ActivityWatch друзьям и коллегам."], + ["Spread the word", "Расскажите другим"], + ["It's still early days for ActivityWatch. We've come a long way but we need users (like you!) to provide feedback and help us turn ActivityWatch into a successful project. Early users like you mean a lot to us, and we hope you'll reach out to us with any ideas you have for improvements!", "ActivityWatch еще находится на раннем этапе. Мы уже прошли большой путь, но нам нужны пользователи вроде вас, чтобы давать обратную связь и помогать развивать проект. Такие ранние пользователи очень важны, и мы рассчитываем на ваши идеи по улучшению системы."], + ["If you are a developer, we hope you can contribute by writing a watcher, visualization, or something else, and share it with us on the forum!", "Если вы разработчик, вы можете помочь проекту: написать watcher, визуализацию или что-то еще и поделиться этим на форуме."], + ["Thank you for using ActivityWatch!", "Спасибо за использование ActivityWatch!"], + ["If you are not interested in this message, then just ignore it. We won't show it very often.", "Если это сообщение вам не нужно, просто проигнорируйте его. Мы показываем его нечасто."], + ["Trends for ", "Тренды за "], + ["Activity for ", "Активность за "], + ["Активность for ", "Активность за "], + ["7 days", "7 дней"], + ["30 days", "30 дней"], + ["Time active:", "Активное время:"], + ["This feature is still in early development.", "Эта функция пока находится на ранней стадии разработки."], + ["This is a work-in-progress experiment.", "Это экспериментальная функция, она ещё не доведена до готового состояния."], + ["Bucket: ", "Бакет: "], + ["Events: ", "События: "], + ["This tool will help you create categories from your uncategorized time.", "Этот инструмент поможет создавать категории из некатегоризированного времени."], + ["Note: These settings are meant for developers who (hopefully) know what they are doing, and as such, may break things unexpectedly.", "Примечание: эти настройки предназначены для разработчиков, которые понимают, что делают, и поэтому могут неожиданно что-нибудь сломать."], + ["It works by fetching all uncategorized time for a recent timeperiod, and then finds the most common words (by time, not count) each of which may then either be ignored (if too broad/irrelevant), or used to create a new (sub)category, or to append the word to a pre-existing category rule. Words with less than 60s of time will not be shown.", "Инструмент получает некатегоризированное время за недавний период и ищет самые частые слова по длительности, а не по количеству. Их можно игнорировать, если они слишком общие, использовать для создания новой подкатегории или добавить в уже существующее правило. Слова с длительностью меньше 60 секунд не показываются."], + ["When you're done, you can inspect the categories in the Settings page.", "После завершения вы сможете проверить категории на странице Настройки."], + ['The time at which days "start", since humans don\'t always go to bed before midnight. Set to 04:00 by default.', 'Время, с которого начинается новый день, так как люди не всегда ложатся спать до полуночи. По умолчанию установлено 04:00.'], + ["The weekday which starts a new week.", "День недели, с которого начинается новая неделя."], + ["The default duration used for 'show last' in the timeline view.", "Длительность по умолчанию для режима 'показать последние' в таймлайне."], + ["The page to open when opening ActivityWatch, or clicking the logo in the top menu.", "Страница, которая открывается при запуске ActivityWatch или при нажатии на логотип в верхнем меню."], + ["Change color theme of the application (you need to change categories colors manually to be suitable with dark mode).", "Изменение цветовой темы приложения. Цвета категорий для темного режима нужно настраивать вручную."], + ["Devmode enables some features that are still work-in-progress.", "Devmode включает некоторые функции, которые всё ещё находятся в стадии разработки."], + ["Querying an entire year is a very heavy operation, and is likely to lead to timeouts. However, the query might be fast enough if you're running aw-server-rust.", "Запрос за целый год является очень тяжёлой операцией и может приводить к таймаутам. Но если у вас работает aw-server-rust, такой запрос может выполняться достаточно быстро."], + ["Multidevice query is where events are collected from several hosts in the Activity view. It is an early experiment, that currently does not support browser buckets (or the audible-as-active feature).", "Multidevice query собирает события с нескольких хостов в представлении Активность. Это ранний эксперимент, который пока не поддерживает бакеты браузера и функцию активной вкладки со звуком."], + ["The maximum amount of time a server request can take before timing out. Setting this to a high value can be useful for large queries. Note that you need to reload the web UI for it to apply.", "Максимальное время выполнения серверного запроса до срабатывания таймаута. Увеличенное значение может быть полезно для больших запросов. Чтобы изменение вступило в силу, нужно перезагрузить Web UI."], + ["We will send you a notification if there is a new release available for download, this check will happen at most once per day.", "При появлении нового релиза для скачивания будет показано уведомление. Проверка выполняется не чаще одного раза в день."], + ["Uses the old coloring style for some visualizations when uncategorized or no category color.", "Использует старую схему раскраски для некоторых визуализаций, когда категория не задана или у нее нет цвета."], + ["Apps or titles matching this regular expression will never be counted as AFK.", "Приложения или заголовки, подходящие под это регулярное выражение, никогда не будут считаться AFK."], + ["Can be used to count time as active, despite no input (like meetings, or games with controllers). An empty string disables it.", "Позволяет считать время активным даже без ввода, например на встречах или в играх с контроллером. Пустая строка отключает функцию."], + ["Example expression:", "Пример выражения:"], + ["Rules for categorizing events. An event can only have one category. If several categories match, the deepest one will be chosen.", "Правила категоризации событий. Событие может иметь только одну категорию. Если подходят несколько, будет выбрана самая глубокая."], + ["You can use the Category Builder to quickly create categories from uncategorized activity.", "Через Конструктор категорий можно быстро создавать категории из некатегоризированной активности."], + ["You can also find and share categorization rule presets on the forum.", "Готовые наборы правил категоризации можно находить и публиковать на форуме."], + ["For help on how to write categorization rules, see the documentation.", "Как писать правила категоризации, описано в документации."], + ["Generate a report of time spent on a certain category of device activity.", "Сформировать отчет по времени в выбранной категории активности устройства."], + ["See the documentation for help on how to write queries.", "Как писать запросы, смотрите в документации."], + ["See the documentation for help", "См. документацию для справки"], + ["See the documentation", "См. документацию"], + ["on how to write queries.", "по написанию запросов."], + ["Number of events:", "Количество событий:"], + ["Query", "Запрос"], + ["EventsShowing", "Показано событий"], + ["Drag to pan and scroll to zoom", "Перетаскивайте для прокрутки и используйте колесо мыши для масштабирования"], + ["Made with", "Сделано с"], + ["by the", "командой"], + ["Сделано скомандой", "Сделано командой"], + ["ActivityWatch developers", "разработчиков ActivityWatch"], + ["Report a bug", "Сообщить об ошибке"], + ["Ask for help", "Получить помощь"], + ["Vote on features", "Голосовать за функции"], + ["Donate", "Поддержать"], + ["TwitterGitHub", "Twitter GitHub"], + ["Using bucket:", "Используется бакет:"], + ["This is an early experiment. Data entered here is not shown in the Activity view, yet.", "Это ранний эксперимент. Данные, введенные здесь, пока не отображаются в представлении Активность."], + ["Started ", "Запущен "], + ["hours ago", "часов назад"], + ["days ago", "дней назад"], + ["0s ago", "0 с назад"], + ["minutes", "минут"], + ["Generate a report", "Сформировать отчет"], + ["Goal name:", "Имя цели:"], + ["Category:", "Категория:"], + ["Current:", "Текущее:"], + ["Toggle autorefresh every ", "Автообновление каждые "], + ["No events match selected criteria. Timeline is not updated.", "Нет событий, соответствующих выбранным критериям. Таймлайн не обновлен."], + ["Last update:", "Последнее обновление:"], + ["See PR aw-webui#365 for more information.", "Подробности см. в PR aw-webui#365."], + ["See PR aw-webui#365", "См. PR aw-webui#365"], + ["for more information.", "для дополнительной информации."], + ["Displays a graph of categories and their transitions.", "Показывает граф категорий и переходов между ними."], + ["Max category depth", "Максимальная глубина категории"], + ["Exclude uncategorized", "Исключать некатегоризированное"], + ["Just some tools to aid in development and debugging.", "Набор инструментов для разработки и отладки."], + ["Nothing to see here right now...", "Сейчас здесь ничего полезного нет..."], + ["Are you looking to collect more data? Check out the docs for more watchers.", "Нужно собирать больше данных? Посмотрите документацию по дополнительным watcher-модулям."], + ["Are you looking to collect more data?", "Нужно собирать больше данных?"], + ["Check out the docs for more watchers.", "Посмотрите документацию по дополнительным watcher-модулям."], + ["Check out the docs for more watchers", "Посмотрите документацию по дополнительным watcher-модулям"], + ["Click to sort ascending", "Нажмите для сортировки по возрастанию"], + ["Host:", "Хост:"], + ["Hostname:", "Имя хоста:"], + ["Range:", "Диапазон:"], + ["serverVersion", "Версия"], + ["Version:", "Версия:"], + ["Last updated:", "Последнее обновление:"], + ["First seen:", "Впервые замечен:"], + ["When you're done, you can inspect the categories", "После завершения вы сможете проверить категории"], + ["in the Settings page.", "на странице Настройки."], + ["Activity (", "Активность ("], + ["Exclude time away from computer", "Исключать время отсутствия за компьютером"], + ['Common words in "Uncategorized" events', 'Частые слова в событиях "Без категории"'], + ["No words with significant duration. You're good to go!", "Нет слов со значимой длительностью. Здесь всё в порядке."], + ["Top apps", "Топ приложений"], + ["Top titles", "Топ заголовков"], + ["Top URLs", "Топ URL"], + ["Top domains", "Топ доменов"], + ["Top Browser Domains", "Топ доменов браузера"], + ["Top Browser URLs", "Топ URL браузера"], + ["Top Browser Titles", "Топ заголовков браузера"], + ["Top Categories", "Топ категорий"], + ["Category Tree", "Дерево категорий"], + ["Timeline (barchart)", "Таймлайн (гистограмма)"], + ["Calculate Work Time", "Рассчитать рабочее время"], + ["Export CSV", "Экспорт CSV"], + ["Export JSON", "Экспорт JSON"], + ["No duplicate events found.", "Дубликаты событий не найдены."], + ["No overlapping events found.", "Пересекающиеся события не найдены."], + ["No zero-duration events found.", "События нулевой длительности не найдены."] + ]; + + const hiddenNavLabels = new Set([ + "Raw Data", + "Сырые данные" + ]); + + const hiddenNavHrefPatterns = [ + /\/raw-data\b/i, + /\/raw\b/i + ]; + + const dlpVerdictOptions = [ + { value: "false_positive", label: "Ложное срабатывание" }, + { value: "allowed", label: "Разрешено" }, + { value: "review_needed", label: "На проверку" }, + { value: "incident", label: "Инцидент" } + ]; + + function replaceText(text) { + if (!text) return text; + if (exact.has(text.trim())) { + return text.replace(text.trim(), exact.get(text.trim())); + } + let result = text; + for (const [en, ru] of partial) { + result = result.split(en).join(ru); + } + return result; + } + + function walk(root) { + const walker = document.createTreeWalker(root, NodeFilter.SHOW_TEXT, null); + const nodes = []; + while (walker.nextNode()) nodes.push(walker.currentNode); + for (const node of nodes) { + const nextValue = replaceText(node.nodeValue); + if (nextValue !== node.nodeValue) { + node.nodeValue = nextValue; + } + } + } + + function translateAttributes(root) { + const elements = root.querySelectorAll("[title],[placeholder],[aria-label]"); + for (const element of elements) { + ["title", "placeholder", "aria-label"].forEach(function (attr) { + const value = element.getAttribute(attr); + if (value) { + element.setAttribute(attr, replaceText(value)); + } + }); + } + } + + function injectStyles() { + if (document.getElementById("aw-ru-hide-noise-style")) return; + const style = document.createElement("style"); + style.id = "aw-ru-hide-noise-style"; + style.textContent = [ + '[href*="/raw-data"], [href*="/raw"], a[data-testid*="raw"], button[data-testid*="raw"] { display: none !important; }', + '[aria-label="Raw Data"], [aria-label="Сырые данные"] { display: none !important; }', + '.aw-ru-dlp-center { margin: 16px 0; padding: 16px; border: 1px solid rgba(120,120,120,.35); border-radius: 8px; background: rgba(20,20,20,.03); }', + '.aw-ru-dlp-toolbar { display: flex; flex-wrap: wrap; gap: 12px; align-items: center; margin-bottom: 12px; }', + '.aw-ru-dlp-toolbar input, .aw-ru-dlp-toolbar select, .aw-ru-dlp-toolbar textarea { min-height: 32px; }', + '.aw-ru-dlp-toolbar button, .aw-ru-dlp-row button { min-height: 32px; padding: 4px 10px; }', + '.aw-ru-dlp-table { width: 100%; border-collapse: collapse; font-size: 13px; }', + '.aw-ru-dlp-table th, .aw-ru-dlp-table td { border: 1px solid rgba(120,120,120,.25); padding: 6px; vertical-align: top; }', + '.aw-ru-dlp-table td input, .aw-ru-dlp-table td select { width: 100%; box-sizing: border-box; }', + '.aw-ru-dlp-muted { opacity: .55; }', + '.aw-ru-dlp-pill { display: inline-block; padding: 2px 8px; border-radius: 999px; background: rgba(90,140,255,.15); font-size: 12px; }', + '.aw-ru-dlp-status { margin-left: auto; font-size: 12px; opacity: .8; }', + '.aw-ru-dlp-message { margin-top: 8px; font-size: 12px; }', + '.aw-ru-dlp-actions { display: flex; gap: 6px; flex-wrap: wrap; }', + '.aw-ru-dlp-section { margin-top: 18px; }', + '.aw-ru-dlp-section h5 { margin: 0 0 8px; }', + '.aw-ru-host-groups { margin: 16px 0; padding: 16px; border: 1px solid rgba(120,120,120,.35); border-radius: 8px; background: rgba(20,20,20,.03); }', + '.aw-ru-host-groups-grid { display: grid; grid-template-columns: repeat(auto-fit, minmax(280px, 1fr)); gap: 16px; }', + '.aw-ru-host-group-card { border: 1px solid rgba(120,120,120,.25); border-radius: 8px; padding: 12px; background: rgba(255,255,255,.02); }', + '.aw-ru-host-group-card h4 { margin: 0 0 8px; }', + '.aw-ru-host-group-card p { margin: 0 0 12px; font-size: 13px; opacity: .85; }', + '.aw-ru-host-list { display: flex; flex-direction: column; gap: 8px; }', + '.aw-ru-host-item { border: 1px solid rgba(120,120,120,.2); border-radius: 6px; padding: 8px; }', + '.aw-ru-host-item-title { font-weight: 600; margin-bottom: 6px; }', + '.aw-ru-host-links { display: flex; flex-wrap: wrap; gap: 6px; }', + '.aw-ru-host-links a { display: inline-block; padding: 4px 8px; border-radius: 999px; background: rgba(90,140,255,.15); text-decoration: none; }', + '.aw-ru-pve-audit { margin: 16px 0; padding: 16px; border: 1px solid rgba(120,120,120,.35); border-radius: 8px; background: rgba(10,20,40,.04); }', + '.aw-ru-pve-audit-grid { display: grid; grid-template-columns: repeat(auto-fit, minmax(220px, 1fr)); gap: 12px; margin: 12px 0 16px; }', + '.aw-ru-pve-audit-card { border: 1px solid rgba(120,120,120,.22); border-radius: 8px; padding: 12px; background: rgba(255,255,255,.02); }', + '.aw-ru-pve-audit-card h5 { margin: 0 0 6px; font-size: 13px; opacity: .8; }', + '.aw-ru-pve-audit-value { font-size: 24px; font-weight: 700; }', + '.aw-ru-pve-audit-table { width: 100%; border-collapse: collapse; margin-top: 8px; }', + '.aw-ru-pve-audit-table th, .aw-ru-pve-audit-table td { padding: 6px 8px; border-bottom: 1px solid rgba(120,120,120,.18); vertical-align: top; text-align: left; font-size: 13px; }', + '.aw-ru-pve-audit-muted { opacity: .72; font-size: 13px; }' + ].join("\n"); + document.head.appendChild(style); + } + + function hideNoiseNavigation(root) { + const links = root.querySelectorAll("a, button, [role='button']"); + for (const element of links) { + const text = (element.textContent || "").trim(); + const href = (element.getAttribute("href") || "").trim(); + if (hiddenNavLabels.has(text) || hiddenNavHrefPatterns.some((pattern) => pattern.test(href))) { + const container = element.closest("li, nav, div") || element; + container.style.display = "none"; + } + } + } + + function getCurrentHostFromHash() { + const hash = window.location.hash || ""; + const activityMatch = hash.match(/#\/activity\/([^/?#]+)/); + if (activityMatch && activityMatch[1]) return decodeURIComponent(activityMatch[1]); + const trendsMatch = hash.match(/#\/trends\/([^/?#]+)/); + if (trendsMatch && trendsMatch[1]) return decodeURIComponent(trendsMatch[1]); + return ""; + } + + function isPveLikeHost(host) { + return /^pve[-_]/i.test(String(host || "")); + } + + function enforceSafeActivityViewForPveHost() { + const hash = window.location.hash || ""; + const match = hash.match(/^#\/activity\/([^/]+)\/day\/([^/]+)\/view\/([^/?#]+)/i); + if (!match) return; + const host = decodeURIComponent(match[1] || ""); + const day = decodeURIComponent(match[2] || ""); + const viewId = decodeURIComponent(match[3] || ""); + if (!isPveLikeHost(host)) return; + const safeHash = "#/activity/" + encodeURIComponent(host) + "/day/" + encodeURIComponent(day) + "/view/" + encodeURIComponent("pve_audit"); + if (safeHash !== hash && !/^pve_audit$/i.test(viewId)) { + window.location.replace(safeHash); + } + } + + function getDlpHostFromSettings(settings) { + const routeHost = getCurrentHostFromHash(); + if (routeHost) return routeHost; + const bucketHost = getDlpHostFromBucketId(getDlpBucketIdFromHash()); + if (bucketHost) return bucketHost; + return getTrendsHostFromSettings(settings); + } + + function getDlpHref(host) { + if (!host) return "#/buckets"; + return "#/buckets/" + encodeURIComponent("aw-dlp-endpoint-signals_" + host); + } + + function isDlpSignalBucketRoute() { + return /^#\/buckets\/aw-dlp-endpoint-signals_/i.test(window.location.hash || ""); + } + + function isAlertsRoute() { + return /^#\/alerts(?:[/?#]|$)/i.test(window.location.hash || ""); + } + + function getDlpBucketIdFromHash() { + const hash = window.location.hash || ""; + const match = hash.match(/^#\/buckets\/([^/?#]+)/i); + return match && match[1] ? decodeURIComponent(match[1]) : ""; + } + + function getDlpHostFromBucketId(bucketId) { + const prefix = "aw-dlp-endpoint-signals_"; + return bucketId.startsWith(prefix) ? bucketId.slice(prefix.length) : ""; + } + + function escapeHtml(value) { + return String(value == null ? "" : value) + .replace(/&/g, "&") + .replace(//g, ">") + .replace(/"/g, """) + .replace(/'/g, "'"); + } + + function normalizeText(value) { + return String(value == null ? "" : value).trim(); + } + + function buildDlpKey(event) { + const data = event && event.data ? event.data : {}; + return [ + event && event.timestamp || "", + data.signalType || "", + data.username || "", + data.owner || "", + data.documentName || "", + data.printerName || "" + ].join("|"); + } + + function generateDlpId(prefix) { + return prefix + "-" + Date.now().toString(36) + "-" + Math.random().toString(36).slice(2, 10); + } + + async function awApiJson(url, options) { + const response = await fetch(url, Object.assign({ + credentials: "same-origin", + headers: { + "Content-Type": "application/json; charset=utf-8" + } + }, options || {})); + if (response.status === 304 || response.status === 409) { + return null; + } + if (!response.ok) { + throw new Error("aw-api-" + response.status); + } + if (response.status === 204) return null; + const text = await response.text(); + return text ? JSON.parse(text) : null; + } + + async function ensureAwBucket(bucketId, clientName, bucketType, hostname) { + await awApiJson("/api/0/buckets/" + encodeURIComponent(bucketId), { + method: "POST", + body: JSON.stringify({ + client: clientName, + type: bucketType, + hostname: hostname + }) + }); + } + + async function saveAwHeartbeat(bucketId, payload, pulsetimeSeconds) { + const pulsetime = pulsetimeSeconds || 1; + await awApiJson("/api/0/buckets/" + encodeURIComponent(bucketId) + "/heartbeat?pulsetime=" + pulsetime, { + method: "POST", + body: JSON.stringify(payload) + }); + } + + async function loadBucketEvents(bucketId, limit) { + const data = await awApiJson("/api/0/buckets/" + encodeURIComponent(bucketId) + "/events?limit=" + (limit || 100), { + method: "GET", + headers: {} + }); + return Array.isArray(data) ? data : []; + } + + function getRuleMatchFields(event) { + const data = event && event.data ? event.data : {}; + return { + signalType: normalizeText(data.signalType), + username: normalizeText(data.username), + owner: normalizeText(data.owner), + documentName: normalizeText(data.documentName), + printerName: normalizeText(data.printerName), + hostname: normalizeText(data.hostname) + }; + } + + function serializeRuleMatch(match) { + const normalized = match || {}; + return [ + normalized.signalType || "", + normalized.username || "", + normalized.owner || "", + normalized.documentName || "", + normalized.printerName || "", + normalized.hostname || "" + ].join("|"); + } + + function getRuleId(ruleEvent) { + const data = ruleEvent && ruleEvent.data ? ruleEvent.data : {}; + return normalizeText(data.ruleId) || [ + serializeRuleMatch(data.match || {}), + normalizeText(data.category), + normalizeText(data.action) + ].join("|"); + } + + function getReviewId(reviewEvent) { + const data = reviewEvent && reviewEvent.data ? reviewEvent.data : {}; + const review = data.review || {}; + return normalizeText(review.reviewId) || [ + data.sourceEvent && data.sourceEvent.timestamp || "", + data.sourceEvent && data.sourceEvent.data ? buildDlpKey({ timestamp: data.sourceEvent.timestamp, data: data.sourceEvent.data }) : "", + normalizeText(review.verdict), + normalizeText(review.category) + ].join("|"); + } + + function collapseRuleEvents(events) { + const ordered = (events || []).slice().sort(function (a, b) { + return String(a.timestamp).localeCompare(String(b.timestamp)); + }); + const map = new Map(); + ordered.forEach(function (event) { + map.set(getRuleId(event), event); + }); + return Array.from(map.values()).sort(function (a, b) { + return String(b.timestamp).localeCompare(String(a.timestamp)); + }); + } + + function collapseReviewEvents(events) { + const ordered = (events || []).slice().sort(function (a, b) { + return String(a.timestamp).localeCompare(String(b.timestamp)); + }); + const map = new Map(); + ordered.forEach(function (event) { + map.set(getReviewId(event), event); + }); + return Array.from(map.values()).sort(function (a, b) { + return String(b.timestamp).localeCompare(String(a.timestamp)); + }); + } + + function ruleMatchesEvent(rule, event) { + const eventFields = getRuleMatchFields(event); + const match = rule && rule.data && rule.data.match ? rule.data.match : {}; + return Object.keys(eventFields).every(function (key) { + const ruleValue = normalizeText(match[key]); + return !ruleValue || ruleValue === eventFields[key]; + }); + } + + function getSuppressionState() { + if (!window.__awRuDlpState) { + window.__awRuDlpState = { + rules: [], + activeRules: [], + reviews: [], + events: [], + loading: false + }; + } + return window.__awRuDlpState; + } + + function removeBadDlpLinks(root) { + const badLinks = root.querySelectorAll("a[href*='/view/DLP']"); + badLinks.forEach(function (link) { + const item = link.closest("li") || link; + item.remove(); + }); + } + + function updateDlpLinks(root, href) { + const links = root.querySelectorAll("a[data-aw-ru-dlp-link='1']"); + for (const link of links) { + if (link.getAttribute("href") !== href) { + link.setAttribute("href", href); + } + } + } + + function buildDlpNavItem(templateItem, href) { + const templateLink = templateItem.querySelector("a[href], [role='link']"); + if (!templateLink) return null; + + const item = document.createElement("li"); + item.setAttribute("data-aw-ru-dlp-item", "1"); + item.className = templateItem.className || ""; + + const link = document.createElement("a"); + link.setAttribute("href", href); + link.setAttribute("data-aw-ru-dlp-link", "1"); + link.textContent = "DLP"; + link.className = templateLink.className || ""; + + item.appendChild(link); + return item; + } + + function findPrimaryNavList(root) { + const navLists = Array.from(root.querySelectorAll("nav ul")); + return navLists.find(function (list) { + const labels = Array.from(list.querySelectorAll("a")) + .map(function (link) { return normalizeText(link.textContent); }) + .filter(Boolean); + return labels.includes("Главная") || + labels.includes("Home") || + labels.includes("Активность") || + labels.includes("Activity"); + }) || null; + } + + function injectDlpNavigation(root) { + const hostForDlp = window.__awRuPatchSettingsHost || getCurrentHostFromHash(); + if (hostForDlp && isPveLikeHost(hostForDlp)) { + removeBadDlpLinks(root); + const ownItem = root.querySelector("[data-aw-ru-dlp-item='1']"); + if (ownItem) ownItem.remove(); + return; + } + const href = getDlpHref(hostForDlp); + removeBadDlpLinks(root); + updateDlpLinks(root, href); + if (root.querySelector("[data-aw-ru-dlp-item='1']")) return; + + const primaryNav = findPrimaryNavList(root); + if (primaryNav) { + const templateItem = primaryNav.querySelector("li") || primaryNav.parentElement; + const dlpItem = templateItem ? buildDlpNavItem(templateItem, href) : null; + if (dlpItem) { + primaryNav.appendChild(dlpItem); + return; + } + const item = document.createElement("li"); + item.setAttribute("data-aw-ru-dlp-item", "1"); + const link = document.createElement("a"); + link.setAttribute("href", href); + link.setAttribute("data-aw-ru-dlp-link", "1"); + link.textContent = "DLP"; + item.appendChild(link); + primaryNav.appendChild(item); + } + } + + function isHomeRoute() { + const hash = window.location.hash || ""; + return !hash || /^#\/home(?:[/?#]|$)/i.test(hash); + } + + function getDefaultHostGroupsConfig() { + return { + groups: [ + { + id: "windows-rdp", + name: "Windows RDP", + description: "Пользовательские Windows/RDP хосты.", + patterns: ["^(SHARKON|WIN|RDP|TERM|TS-|WS-)"], + links: [ + { label: "Активность", type: "activity" }, + { label: "DLP", type: "bucket", bucket_prefix: "aw-dlp-endpoint-signals_" } + ] + }, + { + id: "virtual-infra", + name: "Virtual servers + Proxmox", + description: "Инфраструктурные VM, Proxmox и сетевые узлы.", + patterns: ["^(PFSENSE|PVE|PROXMOX|DEBIAN|UBUNTU|LINUX|VM-|SRV-|INFRA-)"], + links: [ + { label: "pfSense health", type: "bucket", bucket_prefix: "aw-pfsense-health_" }, + { label: "pfSense gateways", type: "bucket", bucket_prefix: "aw-pfsense-gateways_" }, + { label: "Все бакеты", type: "buckets" } + ] + } + ], + ungrouped_name: "Прочие хосты" + }; + } + + function getHostGroupsState() { + if (!window.__awRuHostGroupsState) { + window.__awRuHostGroupsState = { + config: null, + buckets: null, + loading: false + }; + } + return window.__awRuHostGroupsState; + } + + async function ensureHostGroupsData() { + const state = getHostGroupsState(); + if (state.loading) return state; + if (state.config && state.buckets) return state; + state.loading = true; + try { + if (!state.config) { + try { + state.config = await awApiJson("/js/aw-host-groups.json?v=" + encodeURIComponent(window.__awRuPatchVersion), { method: "GET", headers: {} }); + } catch (error) { + state.config = getDefaultHostGroupsConfig(); + } + } + if (!state.buckets) { + state.buckets = await awApiJson("/api/0/buckets/", { method: "GET", headers: {} }); + } + } finally { + state.loading = false; + } + return state; + } + + function isPveActivityRoute() { + const hash = window.location.hash || ""; + const match = hash.match(/^#\/activity\/([^/]+)/i); + return !!(match && isPveLikeHost(decodeURIComponent(match[1] || ""))); + } + + function extractHostFromBucket(bucketId, bucketMeta) { + if (bucketMeta && bucketMeta.hostname) return String(bucketMeta.hostname); + const prefixes = [ + "aw-watcher-window_", + "aw-watcher-afk_", + "aw-dlp-endpoint-signals_", + "aw-dlp-incidents_", + "aw-pfsense-health_", + "aw-pfsense-gateways_", + "aw-pfsense-interfaces_" + ]; + for (const prefix of prefixes) { + if (bucketId.indexOf(prefix) === 0) { + return bucketId.slice(prefix.length); + } + } + return ""; + } + + function buildHostBucketMap(rawBuckets) { + const result = new Map(); + const entries = Array.isArray(rawBuckets) + ? rawBuckets.map(function (item) { return [item.id || "", item]; }) + : Object.entries(rawBuckets || {}); + entries.forEach(function (entry) { + const bucketId = entry[0]; + const meta = entry[1] || {}; + const host = extractHostFromBucket(bucketId, meta); + if (!host) return; + if (!result.has(host)) result.set(host, []); + result.get(host).push(bucketId); + }); + return result; + } + + function matchHostGroup(host, groups) { + for (const group of groups) { + const patterns = Array.isArray(group.patterns) ? group.patterns : []; + for (const pattern of patterns) { + try { + if (new RegExp(pattern, "i").test(host)) { + return group.id; + } + } catch (error) { + } + } + } + return ""; + } + + function buildHostLink(host, hostBuckets, linkDef) { + if (!linkDef || !linkDef.type) return ""; + if (linkDef.type === "activity") { + const viewId = linkDef.view ? String(linkDef.view) : "summary"; + return '#/activity/' + encodeURIComponent(host) + '/day/' + encodeURIComponent(new Date().toISOString().slice(0, 10)) + '/view/' + encodeURIComponent(viewId); + } + if (linkDef.type === "buckets") { + return "#/buckets"; + } + if (linkDef.type === "bucket" && linkDef.bucket_prefix) { + const bucketId = String(linkDef.bucket_prefix) + host; + return hostBuckets.indexOf(bucketId) >= 0 ? '#/buckets/' + encodeURIComponent(bucketId) : ""; + } + return ""; + } + + function renderHostGroupCards(state) { + const config = state.config || getDefaultHostGroupsConfig(); + const groups = Array.isArray(config.groups) ? config.groups : []; + const hostBuckets = buildHostBucketMap(state.buckets); + const grouped = new Map(); + + groups.forEach(function (group) { + grouped.set(group.id, []); + }); + grouped.set("__ungrouped__", []); + + Array.from(hostBuckets.keys()).sort().forEach(function (host) { + const groupId = matchHostGroup(host, groups) || "__ungrouped__"; + grouped.get(groupId).push(host); + }); + + const cards = []; + groups.forEach(function (group) { + const hosts = grouped.get(group.id) || []; + const items = hosts.map(function (host) { + const links = (group.links || []).map(function (linkDef) { + const href = buildHostLink(host, hostBuckets.get(host) || [], linkDef); + return href ? '' + escapeHtml(linkDef.label || "Открыть") + '' : ""; + }).filter(Boolean).join(""); + return '
' + + '
' + escapeHtml(host) + '
' + + '
' + links + '
' + + '
'; + }).join(""); + cards.push( + '
' + + '

' + escapeHtml(group.name || group.id) + '

' + + '

' + escapeHtml(group.description || "") + '

' + + '
' + (items || '
Хосты пока не обнаружены.
') + '
' + + '
' + ); + }); + + const ungroupedHosts = grouped.get("__ungrouped__") || []; + if (ungroupedHosts.length) { + cards.push( + '
' + + '

' + escapeHtml(config.ungrouped_name || "Прочие хосты") + '

' + + '

Хосты, которые пока не попали под шаблоны группировки.

' + + '
' + + ungroupedHosts.map(function (host) { + return '
' + escapeHtml(host) + '
'; + }).join("") + + '
' + + '
' + ); + } + + return cards.join(""); + } + + async function injectHostGroupsCenter(root) { + if (!isHomeRoute()) return; + const heading = root.querySelector("h3"); + if (!heading) return; + + let center = root.querySelector("[data-aw-ru-host-groups='1']"); + if (!center) { + center = document.createElement("section"); + center.className = "aw-ru-host-groups"; + center.setAttribute("data-aw-ru-host-groups", "1"); + center.innerHTML = + '

Разделы хостов

' + + '

Здесь хосты разделены на пользовательские Windows RDP и инфраструктурные виртуальные серверы/Proxmox.

' + + '

Загрузка...

'; + heading.parentElement.insertBefore(center, heading.nextSibling); + } + + const state = await ensureHostGroupsData(); + center.querySelector("[data-aw-ru-host-groups-grid]").innerHTML = renderHostGroupCards(state); + } + + function renderDlpTableRows(center, host) { + const state = getSuppressionState(); + const tbody = center.querySelector("[data-aw-ru-dlp-events]"); + if (!tbody) return; + const hideSuppressed = center.querySelector("[data-aw-ru-hide-suppressed]") && center.querySelector("[data-aw-ru-hide-suppressed]").checked; + const rows = []; + for (const event of state.events) { + const matchedRule = state.activeRules.find(function (rule) { return ruleMatchesEvent(rule, event); }) || null; + if (hideSuppressed && matchedRule) continue; + const data = event.data || {}; + const eventKey = buildDlpKey(event); + rows.push( + '' + + "" + escapeHtml(new Date(event.timestamp).toLocaleString()) + "" + + "" + escapeHtml(data.signalType || "") + "" + + "" + escapeHtml(data.username || data.owner || "") + "" + + "" + escapeHtml(data.documentName || "") + "" + + "" + escapeHtml(data.printerName || "") + "" + + "" + (matchedRule ? 'Подавлено правилом' : "") + "" + + '" + + '' + + '' + + '' + + '' + + '' + + "" + + "" + ); + } + tbody.innerHTML = rows.length ? rows.join("") : 'Нет DLP-событий в выборке.'; + center.querySelector("[data-aw-ru-dlp-status]").textContent = + "Событий: " + state.events.length + " · правил: " + state.activeRules.length + "/" + state.rules.length + " · review: " + state.reviews.filter(function (review) { return !(review.data && review.data.review && review.data.review.archived); }).length + "/" + state.reviews.length; + bindDlpRowActions(center, host); + renderDlpRuleManager(center, host); + renderDlpReviewManager(center, host); + } + + async function saveDlpReview(host, event, row) { + const bucketId = "aw-dlp-review_" + host; + await ensureAwBucket(bucketId, "aw-dlp-review", "aw.dlp.review", host); + const verdict = row.querySelector("[data-aw-ru-dlp-verdict]").value; + const category = row.querySelector("[data-aw-ru-dlp-category]").value.trim(); + const comment = row.querySelector("[data-aw-ru-dlp-comment]").value.trim(); + await saveAwHeartbeat(bucketId, { + timestamp: new Date().toISOString(), + duration: 0, + data: { + host: host, + sourceBucket: getDlpBucketIdFromHash(), + sourceEvent: { + timestamp: event.timestamp, + data: event.data || {} + }, + review: { + reviewId: generateDlpId("review"), + verdict: verdict, + category: category, + comment: comment, + archived: false + } + } + }, 1); + if (verdict === "incident") { + await saveDlpIncident(host, event, { + verdict: verdict, + category: category, + comment: comment + }); + } + } + + async function saveDlpIncident(host, event, review) { + const bucketId = "aw-dlp-incidents_" + host; + await ensureAwBucket(bucketId, "aw-dlp-incidents", "aw.dlp.incident", host); + await saveAwHeartbeat(bucketId, { + timestamp: new Date().toISOString(), + duration: 0, + data: { + host: host, + sourceBucket: getDlpBucketIdFromHash(), + sourceEvent: { + timestamp: event.timestamp, + data: event.data || {} + }, + incident: { + incidentId: generateDlpId("incident"), + verdict: review && review.verdict || "incident", + category: review && review.category || "", + comment: review && review.comment || "", + status: "open" + } + } + }, 1); + } + + async function saveDlpRule(host, event, row) { + const bucketId = "aw-dlp-rules_" + host; + await ensureAwBucket(bucketId, "aw-dlp-rules", "aw.dlp.rule", host); + const verdict = row.querySelector("[data-aw-ru-dlp-verdict]").value; + const category = row.querySelector("[data-aw-ru-dlp-category]").value.trim(); + const comment = row.querySelector("[data-aw-ru-dlp-comment]").value.trim(); + await saveAwHeartbeat(bucketId, { + timestamp: new Date().toISOString(), + duration: 0, + data: { + host: host, + ruleId: generateDlpId("rule"), + enabled: true, + action: verdict, + category: category, + comment: comment, + match: getRuleMatchFields(event) + } + }, 1); + } + + function bindDlpRowActions(center, host) { + const state = getSuppressionState(); + const rows = center.querySelectorAll("[data-aw-ru-dlp-key]"); + rows.forEach(function (row) { + if (row.getAttribute("data-aw-ru-bound") === "1") return; + row.setAttribute("data-aw-ru-bound", "1"); + const eventKey = row.getAttribute("data-aw-ru-dlp-key"); + const event = state.events.find(function (item) { return buildDlpKey(item) === eventKey; }); + if (!event) return; + row.querySelector("[data-aw-ru-save-review]").addEventListener("click", async function () { + const message = center.querySelector("[data-aw-ru-dlp-message]"); + try { + await saveDlpReview(host, event, row); + state.reviews = collapseReviewEvents(await loadBucketEvents("aw-dlp-review_" + host, 200)); + renderDlpTableRows(center, host); + message.textContent = "Review сохранен."; + } catch (error) { + message.textContent = "Ошибка сохранения review: " + error.message; + } + }); + row.querySelector("[data-aw-ru-save-rule]").addEventListener("click", async function () { + const message = center.querySelector("[data-aw-ru-dlp-message]"); + try { + await saveDlpRule(host, event, row); + state.rules = collapseRuleEvents(await loadBucketEvents("aw-dlp-rules_" + host, 200)); + state.activeRules = state.rules.filter(function (rule) { return !(rule.data && rule.data.enabled === false); }); + message.textContent = "Правило сохранено."; + renderDlpTableRows(center, host); + } catch (error) { + message.textContent = "Ошибка сохранения правила: " + error.message; + } + }); + }); + } + + async function setDlpRuleEnabled(host, ruleEvent, enabled) { + const bucketId = "aw-dlp-rules_" + host; + await ensureAwBucket(bucketId, "aw-dlp-rules", "aw.dlp.rule", host); + const data = ruleEvent.data || {}; + await saveAwHeartbeat(bucketId, { + timestamp: new Date().toISOString(), + duration: 0, + data: { + host: host, + ruleId: getRuleId(ruleEvent), + enabled: enabled, + action: data.action || "", + category: data.category || "", + comment: data.comment || "", + match: data.match || {} + } + }, 1); + } + + async function setDlpReviewArchived(host, reviewEvent, archived) { + const bucketId = "aw-dlp-review_" + host; + await ensureAwBucket(bucketId, "aw-dlp-review", "aw.dlp.review", host); + const data = reviewEvent.data || {}; + const review = data.review || {}; + await saveAwHeartbeat(bucketId, { + timestamp: new Date().toISOString(), + duration: 0, + data: { + host: host, + sourceBucket: data.sourceBucket || getDlpBucketIdFromHash(), + sourceEvent: data.sourceEvent || {}, + review: { + reviewId: getReviewId(reviewEvent), + verdict: review.verdict || "", + category: review.category || "", + comment: review.comment || "", + archived: archived + } + } + }, 1); + } + + function renderDlpRuleManager(center, host) { + const state = getSuppressionState(); + const tbody = center.querySelector("[data-aw-ru-dlp-rules]"); + if (!tbody) return; + const showDisabled = center.querySelector("[data-aw-ru-show-disabled-rules]") && center.querySelector("[data-aw-ru-show-disabled-rules]").checked; + const rows = []; + state.rules.forEach(function (ruleEvent) { + const data = ruleEvent.data || {}; + const isEnabled = data.enabled !== false; + if (!isEnabled && !showDisabled) return; + rows.push( + '' + + '' + escapeHtml(new Date(ruleEvent.timestamp).toLocaleString()) + '' + + '' + (isEnabled ? 'Активно' : 'Отключено') + '' + + '' + escapeHtml(data.action || "") + '' + + '' + escapeHtml(data.category || "") + '' + + '' + escapeHtml(serializeRuleMatch(data.match || {})) + '' + + '' + escapeHtml(data.comment || "") + '' + + '' + + '' + + '' + + '' + ); + }); + tbody.innerHTML = rows.length ? rows.join("") : 'Сохраненных правил нет.'; + tbody.querySelectorAll("[data-aw-ru-toggle-rule]").forEach(function (button) { + button.addEventListener("click", async function () { + const row = button.closest("[data-aw-ru-rule-id]"); + const ruleId = row && row.getAttribute("data-aw-ru-rule-id"); + const ruleEvent = state.rules.find(function (item) { return getRuleId(item) === ruleId; }); + if (!ruleEvent) return; + const message = center.querySelector("[data-aw-ru-dlp-message]"); + try { + await setDlpRuleEnabled(host, ruleEvent, ruleEvent.data && ruleEvent.data.enabled === false); + state.rules = collapseRuleEvents(await loadBucketEvents("aw-dlp-rules_" + host, 200)); + state.activeRules = state.rules.filter(function (rule) { return !(rule.data && rule.data.enabled === false); }); + renderDlpTableRows(center, host); + message.textContent = "Статус правила обновлен."; + } catch (error) { + message.textContent = "Ошибка обновления правила: " + error.message; + } + }); + }); + } + + function renderDlpReviewManager(center, host) { + const state = getSuppressionState(); + const tbody = center.querySelector("[data-aw-ru-dlp-reviews]"); + if (!tbody) return; + const showArchived = center.querySelector("[data-aw-ru-show-archived-reviews]") && center.querySelector("[data-aw-ru-show-archived-reviews]").checked; + const rows = []; + state.reviews.forEach(function (reviewEvent) { + const data = reviewEvent.data || {}; + const review = data.review || {}; + const archived = review.archived === true; + if (archived && !showArchived) return; + const sourceData = data.sourceEvent && data.sourceEvent.data ? data.sourceEvent.data : {}; + rows.push( + '' + + '' + escapeHtml(new Date(reviewEvent.timestamp).toLocaleString()) + '' + + '' + (archived ? 'Архив' : 'Активно') + '' + + '' + escapeHtml(review.verdict || "") + '' + + '' + escapeHtml(review.category || "") + '' + + '' + escapeHtml(review.comment || "") + '' + + '' + escapeHtml(sourceData.signalType || "") + ' · ' + escapeHtml(sourceData.documentName || sourceData.printerName || sourceData.username || "") + '' + + '' + + '' + + '' + + '' + ); + }); + tbody.innerHTML = rows.length ? rows.join("") : 'Сохраненных review нет.'; + tbody.querySelectorAll("[data-aw-ru-toggle-review]").forEach(function (button) { + button.addEventListener("click", async function () { + const row = button.closest("[data-aw-ru-review-id]"); + const reviewId = row && row.getAttribute("data-aw-ru-review-id"); + const reviewEvent = state.reviews.find(function (item) { return getReviewId(item) === reviewId; }); + if (!reviewEvent) return; + const message = center.querySelector("[data-aw-ru-dlp-message]"); + try { + await setDlpReviewArchived(host, reviewEvent, !(reviewEvent.data && reviewEvent.data.review && reviewEvent.data.review.archived === true)); + state.reviews = collapseReviewEvents(await loadBucketEvents("aw-dlp-review_" + host, 200)); + renderDlpTableRows(center, host); + message.textContent = "Статус review обновлен."; + } catch (error) { + message.textContent = "Ошибка обновления review: " + error.message; + } + }); + }); + } + + async function refreshDlpCenter(center, host) { + const state = getSuppressionState(); + if (state.loading) return; + state.loading = true; + center.querySelector("[data-aw-ru-dlp-message]").textContent = "Загрузка DLP-событий..."; + try { + state.events = (await loadBucketEvents(getDlpBucketIdFromHash(), 200)) + .sort(function (a, b) { return String(b.timestamp).localeCompare(String(a.timestamp)); }); + try { + state.rules = collapseRuleEvents(await loadBucketEvents("aw-dlp-rules_" + host, 200)); + state.activeRules = state.rules.filter(function (rule) { return !(rule.data && rule.data.enabled === false); }); + } catch (error) { + state.rules = []; + state.activeRules = []; + } + try { + state.reviews = collapseReviewEvents(await loadBucketEvents("aw-dlp-review_" + host, 200)); + } catch (error) { + state.reviews = []; + } + renderDlpTableRows(center, host); + center.querySelector("[data-aw-ru-dlp-message]").textContent = "DLP review центр обновлен."; + } catch (error) { + center.querySelector("[data-aw-ru-dlp-message]").textContent = "Ошибка загрузки DLP-событий: " + error.message; + } finally { + state.loading = false; + } + } + + function injectDlpReviewCenter(root) { + if (!isDlpSignalBucketRoute()) return; + const bucketId = getDlpBucketIdFromHash(); + const host = getDlpHostFromBucketId(bucketId); + if (!host) return; + + const heading = root.querySelector("h3"); + if (!heading) return; + + let center = root.querySelector("[data-aw-ru-dlp-center='1']"); + if (!center) { + center = document.createElement("section"); + center.className = "aw-ru-dlp-center"; + center.setAttribute("data-aw-ru-dlp-center", "1"); + center.innerHTML = + '

DLP review и правила

' + + '
' + + 'bucket: ' + escapeHtml(bucketId) + '' + + '' + + '' + + '
Событий: 0 · правил: 0 · review: 0
' + + '
' + + '

Здесь можно категорировать DLP-события и сохранять suppress/rule записи прямо в AW. Это снижает ложные сработки на уровне review-потока.

' + + '' + + '' + + '' + + '
ВремяТипПользовательДокументПринтер/каналСтатусВердиктКатегорияКомментарийДействия
Загрузка...
' + + '
' + + '
' + + '
DLP Rules
' + + '' + + '
' + + '' + + '' + + '' + + '
ВремяСтатусДействиеКатегорияMatchКомментарийУправление
Загрузка...
' + + '
' + + '
' + + '
' + + '
DLP Review
' + + '' + + '
' + + '' + + '' + + '' + + '
ВремяСтатусВердиктКатегорияКомментарийИсточникУправление
Загрузка...
' + + '
' + + '
'; + heading.parentElement.insertBefore(center, heading.nextSibling); + center.querySelector("[data-aw-ru-refresh-dlp]").addEventListener("click", function () { + refreshDlpCenter(center, host); + }); + center.querySelector("[data-aw-ru-hide-suppressed]").addEventListener("change", function () { + renderDlpTableRows(center, host); + }); + center.querySelector("[data-aw-ru-show-disabled-rules]").addEventListener("change", function () { + renderDlpRuleManager(center, host); + }); + center.querySelector("[data-aw-ru-show-archived-reviews]").addEventListener("change", function () { + renderDlpReviewManager(center, host); + }); + } + + if (center.getAttribute("data-aw-ru-loaded") !== "1") { + center.setAttribute("data-aw-ru-loaded", "1"); + refreshDlpCenter(center, host); + } + } + + async function refreshDlpAlertsCenter(center, host) { + center.querySelector("[data-aw-ru-dlp-alerts-message]").textContent = "Загрузка DLP-инцидентов..."; + try { + const events = (await loadBucketEvents("aw-dlp-incidents_" + host, 100)) + .sort(function (a, b) { return String(b.timestamp).localeCompare(String(a.timestamp)); }); + const rows = events.map(function (event) { + const data = event.data || {}; + const incident = data.incident || {}; + const sourceData = data.sourceEvent && data.sourceEvent.data ? data.sourceEvent.data : {}; + return '' + + '' + escapeHtml(new Date(event.timestamp).toLocaleString()) + '' + + '' + escapeHtml(incident.status || "open") + '' + + '' + escapeHtml(incident.category || "") + '' + + '' + escapeHtml(incident.comment || "") + '' + + '' + escapeHtml(sourceData.username || sourceData.owner || "") + '' + + '' + escapeHtml(sourceData.signalType || "") + '' + + '' + escapeHtml(sourceData.documentName || sourceData.printerName || "") + '' + + ''; + }); + center.querySelector("[data-aw-ru-dlp-alerts-events]").innerHTML = rows.length + ? rows.join("") + : 'Операторских DLP-инцидентов пока нет.'; + center.querySelector("[data-aw-ru-dlp-alerts-status]").textContent = "Инцидентов: " + events.length; + center.querySelector("[data-aw-ru-dlp-alerts-message]").textContent = "Список DLP-инцидентов обновлен."; + } catch (error) { + center.querySelector("[data-aw-ru-dlp-alerts-events]").innerHTML = 'Не удалось загрузить DLP-инциденты.'; + center.querySelector("[data-aw-ru-dlp-alerts-message]").textContent = "Ошибка загрузки DLP-инцидентов: " + error.message; + } + } + + async function refreshPveAuditCenter(center, host) { + const message = center.querySelector("[data-aw-ru-pve-audit-message]"); + const recentBody = center.querySelector("[data-aw-ru-pve-audit-events]"); + message.textContent = "Загрузка audit-событий..."; + try { + const [webEvents, taskEvents, sshEvents, cmdEvents] = await Promise.all([ + loadBucketEvents("aw-pve-webadmin-events_" + host, 50).catch(function () { return []; }), + loadBucketEvents("aw-pve-task-events_" + host, 50).catch(function () { return []; }), + loadBucketEvents("aw-ssh-sessions_" + host, 50).catch(function () { return []; }), + loadBucketEvents("aw-console-commands_" + host, 50).catch(function () { return []; }) + ]); + const data = { + web: webEvents || [], + tasks: taskEvents || [], + ssh: sshEvents || [], + cmd: cmdEvents || [] + }; + center.querySelector("[data-aw-ru-pve-web-count]").textContent = String(data.web.length); + center.querySelector("[data-aw-ru-pve-task-count]").textContent = String(data.tasks.length); + center.querySelector("[data-aw-ru-pve-ssh-count]").textContent = String(data.ssh.length); + center.querySelector("[data-aw-ru-pve-cmd-count]").textContent = String(data.cmd.length); + const recent = [] + .concat(data.web.map(function (event) { return { kind: "Web-admin", event: event, text: (event.data && (event.data.method || "") + " " + (event.data.path || "")) || "" }; })) + .concat(data.tasks.map(function (event) { return { kind: "PVE task", event: event, text: (event.data && ((event.data.action || "") + " " + (event.data.target || ""))) || "" }; })) + .concat(data.ssh.map(function (event) { return { kind: "SSH", event: event, text: (event.data && ((event.data.event || "") + " " + (event.data.tty || ""))) || "" }; })) + .concat(data.cmd.slice(0, 25).map(function (event) { return { kind: "Shell", event: event, text: (event.data && (event.data.command || "")) || "" }; })) + .sort(function (a, b) { return String(b.event && b.event.timestamp || "").localeCompare(String(a.event && a.event.timestamp || "")); }) + .slice(0, 25); + recentBody.innerHTML = recent.length ? recent.map(function (item) { + const ev = item.event || {}; + const d = ev.data || {}; + return "" + + "" + escapeHtml(new Date(ev.timestamp).toLocaleString()) + "" + + "" + escapeHtml(item.kind) + "" + + "" + escapeHtml(d.user || d.username || "-") + "" + + "" + escapeHtml(d.remote_ip || d.tty || d.host || "-") + "" + + "" + escapeHtml(item.text) + "" + + ""; + }).join("") : 'Пока нет audit-событий.'; + message.textContent = "Audit-панель обновлена."; + } catch (error) { + recentBody.innerHTML = 'Не удалось загрузить audit-события.'; + message.textContent = "Ошибка загрузки audit-событий: " + error.message; + } + } + + function injectPveAuditCenter(root) { + if (!isPveActivityRoute()) return; + const host = getCurrentHostFromHash(); + if (!host) return; + const heading = root.querySelector("h3"); + if (!heading || !heading.parentElement) return; + let center = root.querySelector("[data-aw-ru-pve-audit='1']"); + if (!center) { + center = document.createElement("section"); + center.className = "aw-ru-pve-audit"; + center.setAttribute("data-aw-ru-pve-audit", "1"); + center.innerHTML = + "

PVE Audit

" + + '

Для Proxmox-хоста показывается audit-панель вместо desktop-виджетов ActivityWatch, так как у этого хоста нет window/afk watcher данных.

' + + '
' + + '
Web-admin
0
' + + '
PVE tasks
0
' + + '
SSH events
0
' + + '
Shell commands
0
' + + "
" + + '' + + "" + + '' + + "
ВремяТипПользовательИсточникДетали
Загрузка...
" + + '
'; + heading.parentElement.insertBefore(center, heading.nextSibling); + } + Array.from(heading.parentElement.children).forEach(function (child) { + if (child === heading || child === center) return; + child.style.display = "none"; + }); + const routeKey = host + "|" + (window.location.hash || ""); + if (center.getAttribute("data-aw-ru-pve-route") !== routeKey) { + center.setAttribute("data-aw-ru-pve-route", routeKey); + refreshPveAuditCenter(center, host); + } + } + + function injectDlpAlertsCenter(root) { + if (!isAlertsRoute()) return; + const host = window.__awRuPatchSettingsHost || getCurrentHostFromHash(); + if (!host) return; + + const heading = root.querySelector("h3"); + if (!heading) return; + + let center = root.querySelector("[data-aw-ru-dlp-alerts='1']"); + if (!center) { + center = document.createElement("section"); + center.className = "aw-ru-dlp-center"; + center.setAttribute("data-aw-ru-dlp-alerts", "1"); + center.innerHTML = + '

DLP-инциденты оператора

' + + '
' + + 'bucket: ' + escapeHtml("aw-dlp-incidents_" + host) + '' + + '' + + '
Инцидентов: 0
' + + '
' + + '

Здесь выводятся DLP-события, которые оператор вручную признал инцидентами через review-центр.

' + + '' + + '' + + '' + + '
ВремяСтатусКатегорияКомментарийПользовательТипДокумент/канал
Загрузка...
' + + '
'; + heading.parentElement.insertBefore(center, heading.nextSibling); + center.querySelector("[data-aw-ru-refresh-dlp-alerts]").addEventListener("click", function () { + refreshDlpAlertsCenter(center, host); + }); + } + + if (center.getAttribute("data-aw-ru-loaded") !== "1") { + center.setAttribute("data-aw-ru-loaded", "1"); + refreshDlpAlertsCenter(center, host); + } + } + + let trendsRedirectInFlight = false; + let settingsHostFetchInFlight = false; + let applyPatchScheduled = false; + + function getTrendsHostFromSettings(settings) { + if (!settings || typeof settings !== "object") return ""; + const landingpage = typeof settings.landingpage === "string" ? settings.landingpage : ""; + const match = landingpage.match(/\/activity\/([^/]+)/); + return match && match[1] ? match[1] : ""; + } + + function getTrendsPath(hash) { + if (!hash) return ""; + const normalized = hash.startsWith("#") ? hash.slice(1) : hash; + return normalized.split("?")[0]; + } + + function shouldRedirectTrends(hash) { + const path = getTrendsPath(hash); + return path === "/trends" || path === "/trends/"; + } + + function redirectBareTrendsRoute() { + if (trendsRedirectInFlight || !shouldRedirectTrends(window.location.hash)) return; + trendsRedirectInFlight = true; + fetch("/api/0/settings/", { credentials: "same-origin" }) + .then(function (response) { + if (!response.ok) throw new Error("settings-fetch-failed"); + return response.json(); + }) + .then(function (settings) { + window.__awRuPatchSettingsHost = getDlpHostFromSettings(settings); + const host = getTrendsHostFromSettings(settings); + if (!host || !shouldRedirectTrends(window.location.hash)) return; + const target = "#/trends/" + encodeURIComponent(host); + if (window.location.hash !== target) { + window.location.replace(target); + } + }) + .catch(function () {}) + .finally(function () { + trendsRedirectInFlight = false; + }); + } + + function ensureSettingsHost() { + if (window.__awRuPatchSettingsHost || settingsHostFetchInFlight) return; + settingsHostFetchInFlight = true; + fetch("/api/0/settings/", { credentials: "same-origin" }) + .then(function (response) { + if (!response.ok) throw new Error("settings-fetch-failed"); + return response.json(); + }) + .then(function (settings) { + window.__awRuPatchSettingsHost = getDlpHostFromSettings(settings); + }) + .catch(function () {}) + .finally(function () { + settingsHostFetchInFlight = false; + injectDlpNavigation(document.body); + }); + } + + function applyPatch() { + enforceSafeActivityViewForPveHost(); + ensureSettingsHost(); + injectStyles(); + walk(document.body); + translateAttributes(document.body); + hideNoiseNavigation(document.body); + injectPveAuditCenter(document.body); + injectDlpNavigation(document.body); + injectDlpReviewCenter(document.body); + injectDlpAlertsCenter(document.body); + injectHostGroupsCenter(document.body).catch(function () {}); + redirectBareTrendsRoute(); + } + + function scheduleApplyPatch() { + if (applyPatchScheduled) return; + applyPatchScheduled = true; + window.setTimeout(function () { + applyPatchScheduled = false; + applyPatch(); + }, 50); + } + + const observer = new MutationObserver(function () { + scheduleApplyPatch(); + }); + + window.addEventListener("load", function () { + applyPatch(); + observer.observe(document.body, { childList: true, subtree: true }); + }); + window.addEventListener("hashchange", function () { + redirectBareTrendsRoute(); + scheduleApplyPatch(); + }); +})(); diff --git a/install-kit-awindows-20260427-211240/aw-server/aw-server.env.example b/install-kit-awindows-20260427-211240/aw-server/aw-server.env.example new file mode 100755 index 0000000..93ef939 --- /dev/null +++ b/install-kit-awindows-20260427-211240/aw-server/aw-server.env.example @@ -0,0 +1,11 @@ +# Copy to /etc/activitywatch/aw-server.env and fill with real values. + +AW_SERVER_VERSION=0.13.2 +AW_SERVER_DOWNLOAD_URL=https://github.com/ActivityWatch/aw-server-rust/releases/download/v0.13.2/aw-server-rust-linux-x86_64.zip +AW_SERVER_BIND_HOST=0.0.0.0 +AW_SERVER_PORT=5600 +AW_SERVER_WEBUI_DIR=/opt/activitywatch/webui-ru +AW_SERVER_DATA_DIR=/var/lib/activitywatch +AW_SERVER_LOG_DIR=/var/log/activitywatch +AW_SERVER_USER=activitywatch +AW_SERVER_GROUP=activitywatch diff --git a/install-kit-awindows-20260427-211240/aw-server/aw-sw-cleanup.js b/install-kit-awindows-20260427-211240/aw-server/aw-sw-cleanup.js new file mode 100755 index 0000000..b7aa742 --- /dev/null +++ b/install-kit-awindows-20260427-211240/aw-server/aw-sw-cleanup.js @@ -0,0 +1,18 @@ +self.addEventListener("install", function (event) { + self.skipWaiting(); + event.waitUntil((async function () { + const keys = await caches.keys(); + await Promise.all(keys.map(function (key) { return caches.delete(key); })); + })()); +}); + +self.addEventListener("activate", function (event) { + event.waitUntil((async function () { + const keys = await caches.keys(); + await Promise.all(keys.map(function (key) { return caches.delete(key); })); + await self.clients.claim(); + await self.registration.unregister(); + })()); +}); + +self.addEventListener("fetch", function () {}); diff --git a/install-kit-awindows-20260427-211240/aw-server/install_aw_server.sh b/install-kit-awindows-20260427-211240/aw-server/install_aw_server.sh new file mode 100755 index 0000000..4d6262e --- /dev/null +++ b/install-kit-awindows-20260427-211240/aw-server/install_aw_server.sh @@ -0,0 +1,117 @@ +#!/bin/bash +set -euo pipefail + +ENV_FILE="/etc/activitywatch/aw-server.env" +if [[ ! -f "$ENV_FILE" ]]; then + echo "missing env file: $ENV_FILE" >&2 + exit 1 +fi + +source "$ENV_FILE" + +required_vars=( + AW_SERVER_VERSION + AW_SERVER_DOWNLOAD_URL + AW_SERVER_BIND_HOST + AW_SERVER_PORT + AW_SERVER_WEBUI_DIR + AW_SERVER_DATA_DIR + AW_SERVER_LOG_DIR + AW_SERVER_USER + AW_SERVER_GROUP +) + +BOOTSTRAP_DIR="/root/bootstrap" +VIEWS_JSON="$BOOTSTRAP_DIR/settings/views-default.json" +CLASSES_JSON="$BOOTSTRAP_DIR/settings/classes-worktime.json" + +for var_name in "${required_vars[@]}"; do + if [[ -z "${!var_name:-}" ]]; then + echo "missing required variable: $var_name" >&2 + exit 1 + fi +done + +export DEBIAN_FRONTEND=noninteractive +apt-get update +apt-get install -y curl ca-certificates unzip jq + +if ! getent group "$AW_SERVER_GROUP" >/dev/null; then + groupadd --system "$AW_SERVER_GROUP" +fi + +if ! id "$AW_SERVER_USER" >/dev/null 2>&1; then + useradd --system --gid "$AW_SERVER_GROUP" --home-dir "$AW_SERVER_DATA_DIR" --shell /usr/sbin/nologin "$AW_SERVER_USER" +fi + +install -d -o "$AW_SERVER_USER" -g "$AW_SERVER_GROUP" /opt/activitywatch/bin +install -d -o "$AW_SERVER_USER" -g "$AW_SERVER_GROUP" /opt/activitywatch/releases +install -d -o "$AW_SERVER_USER" -g "$AW_SERVER_GROUP" "$AW_SERVER_WEBUI_DIR" +install -d -o "$AW_SERVER_USER" -g "$AW_SERVER_GROUP" "$AW_SERVER_DATA_DIR" +install -d -o "$AW_SERVER_USER" -g "$AW_SERVER_GROUP" "$AW_SERVER_LOG_DIR" + +tmp_dir=$(mktemp -d) +trap 'rm -rf "$tmp_dir"' EXIT + +curl -fL "$AW_SERVER_DOWNLOAD_URL" -o "$tmp_dir/aw-server.zip" +unzip -q "$tmp_dir/aw-server.zip" -d "$tmp_dir/unpacked" + +server_bin=$(find "$tmp_dir/unpacked" -type f \( -name 'aw-server-rust' -o -name 'aw-server' \) | head -n 1) +webui_dir=$(find "$tmp_dir/unpacked" -type d \( -name 'webui' -o -name 'aw-webui' \) | head -n 1 || true) + +if [[ -z "$server_bin" || ! -f "$server_bin" ]]; then + echo "aw-server binary not found in archive" >&2 + exit 1 +fi + +release_dir="/opt/activitywatch/releases/aw-server-rust-v${AW_SERVER_VERSION}" +rm -rf "$release_dir" +install -d -o "$AW_SERVER_USER" -g "$AW_SERVER_GROUP" "$release_dir" +install -m 0755 -o "$AW_SERVER_USER" -g "$AW_SERVER_GROUP" "$server_bin" "$release_dir/aw-server-rust" +ln -sfn "$release_dir/aw-server-rust" /opt/activitywatch/bin/aw-server-rust + +if [[ -n "$webui_dir" && -d "$webui_dir" ]]; then + rm -rf "$AW_SERVER_WEBUI_DIR" + mkdir -p "$AW_SERVER_WEBUI_DIR" + cp -a "$webui_dir"/. "$AW_SERVER_WEBUI_DIR"/ + chown -R "$AW_SERVER_USER:$AW_SERVER_GROUP" "$AW_SERVER_WEBUI_DIR" +fi + +sed \ + -e "s#__AW_SERVER_USER__#$AW_SERVER_USER#g" \ + -e "s#__AW_SERVER_GROUP__#$AW_SERVER_GROUP#g" \ + -e "s#__AW_SERVER_DATA_DIR__#$AW_SERVER_DATA_DIR#g" \ + /root/bootstrap/activitywatch-server.service > /etc/systemd/system/activitywatch-server.service +chmod 0644 /etc/systemd/system/activitywatch-server.service + +systemctl daemon-reload +systemctl enable activitywatch-server.service +systemctl restart activitywatch-server.service +systemctl --no-pager --full status activitywatch-server.service || true + +for _ in $(seq 1 20); do + if curl -fsS "http://127.0.0.1:${AW_SERVER_PORT}/api/0/info" >/dev/null 2>&1; then + break + fi + sleep 2 +done + +if [[ -f "$CLASSES_JSON" ]]; then + curl -fsS -X POST \ + -H 'Content-Type: application/json' \ + --data-binary @"$CLASSES_JSON" \ + "http://127.0.0.1:${AW_SERVER_PORT}/api/0/settings/classes" >/dev/null + echo "Applied worktime classes from $CLASSES_JSON" +else + echo "Worktime classes bootstrap not found, skipped: $CLASSES_JSON" +fi + +if [[ -f "$VIEWS_JSON" ]]; then + curl -fsS -X POST \ + -H 'Content-Type: application/json' \ + --data-binary @"$VIEWS_JSON" \ + "http://127.0.0.1:${AW_SERVER_PORT}/api/0/settings/views" >/dev/null + echo "Applied baseline views from $VIEWS_JSON" +else + echo "Views bootstrap not found, skipped: $VIEWS_JSON" +fi diff --git a/install-kit-awindows-20260427-211240/aw-server/settings/classes-worktime.json b/install-kit-awindows-20260427-211240/aw-server/settings/classes-worktime.json new file mode 100644 index 0000000..b6361f4 --- /dev/null +++ b/install-kit-awindows-20260427-211240/aw-server/settings/classes-worktime.json @@ -0,0 +1,90 @@ +[ + { + "id": 0, + "name": ["Работа"], + "rule": { "type": "none" }, + "data": {} + }, + { + "id": 1, + "name": ["Работа", "1С"], + "rule": { + "type": "regex", + "regex": "\\b(1cv8s?|1cv8c|1cestart)\\.exe\\b|1С:Предприятие|Запуск 1С:Предприятия|Загрузка конфигурационной информации|Доступ к информационной базе", + "ignore_case": true + }, + "data": { "color": "#194D33" } + }, + { + "id": 2, + "name": ["Работа", "Документы"], + "rule": { + "type": "regex", + "regex": "\\b(winword|excel|powerpnt|outlook|acrord32|acrord64)\\.exe\\b|Adobe Reader|Acrobat", + "ignore_case": true + }, + "data": { "color": "#2E7D32" } + }, + { + "id": 3, + "name": ["Работа", "Коммуникации"], + "rule": { + "type": "regex", + "regex": "\\b(teams|telegram|slack|thunderbird|zoom|skype|whatsapp|viber|discord)\\.exe\\b|Mattermost|Element|Riot", + "ignore_case": true + }, + "data": { "color": "#1E88E5" } + }, + { + "id": 4, + "name": ["Работа", "Администрирование"], + "rule": { + "type": "regex", + "regex": "\\b(mstsc|putty|kitty|winscp|anydesk|teamviewer|vncviewer|mmc|regedit|services|control|powershell|cmd)\\.exe\\b", + "ignore_case": true + }, + "data": { "color": "#6D4C41" } + }, + { + "id": 5, + "name": ["Интернет"], + "rule": { "type": "none" }, + "data": {} + }, + { + "id": 6, + "name": ["Интернет", "Браузер"], + "rule": { + "type": "regex", + "regex": "\\b(chrome|msedge|firefox|opera|brave|vivaldi|browser)\\.exe\\b", + "ignore_case": true + }, + "data": { "color": "#00897B" } + }, + { + "id": 7, + "name": ["Система"], + "rule": { "type": "none" }, + "data": {} + }, + { + "id": 8, + "name": ["Система", "Windows"], + "rule": { + "type": "regex", + "regex": "\\b(SearchHost|explorer|ShellExperienceHost|ApplicationFrameHost|RuntimeBroker|sihost|dwm|svchost|fontdrvhost|userinit)\\.exe\\b|\\\\Windows\\\\System32", + "ignore_case": true + }, + "data": { "color": "#607D8B" } + }, + { + "id": 9, + "name": ["ActivityWatch"], + "rule": { + "type": "regex", + "regex": "ActivityWatch|\\baw-(watcher|qt)\\.exe\\b", + "ignore_case": true + }, + "data": {} + } +] diff --git a/install-kit-awindows-20260427-211240/aw-server/settings/views-default.json b/install-kit-awindows-20260427-211240/aw-server/settings/views-default.json new file mode 100644 index 0000000..439fce6 --- /dev/null +++ b/install-kit-awindows-20260427-211240/aw-server/settings/views-default.json @@ -0,0 +1,39 @@ +[ + { + "id": "summary", + "name": "Summary", + "elements": [ + { "type": "top_titles", "size": 3 }, + { "type": "timeline_barchart", "size": 3 }, + { "type": "top_categories", "size": 3 }, + { "type": "category_tree", "size": 3 } + ] + }, + { + "id": "window", + "name": "Window", + "elements": [ + { "type": "top_apps", "size": 3, "props": {} } + ] + }, + { + "id": "DLP", + "name": "DLP", + "elements": [] + }, + { + "id": "worktime", + "name": "Worktime", + "elements": [ + { "type": "top_categories", "size": 3, "props": {} }, + { "type": "timeline_barchart", "size": 3, "props": {} }, + { "type": "category_tree", "size": 3, "props": {} }, + { "type": "top_apps", "size": 3, "props": {} } + ] + }, + { + "id": "pve_audit", + "name": "PVE Audit", + "elements": [] + } +] diff --git a/proxmox/push-aw-artifacts.sh b/proxmox/push-aw-artifacts.sh index da46de2..d3b2d91 100755 --- a/proxmox/push-aw-artifacts.sh +++ b/proxmox/push-aw-artifacts.sh @@ -25,11 +25,16 @@ for file_name in \ activitywatch-server.service \ aw-server.env.example \ aw-ru-patch.js \ - aw-sw-cleanup.js + aw-sw-cleanup.js \ + aw-host-groups.json do pct push "$CT_ID" "$PROJECT_ROOT/aw-server/$file_name" "/root/bootstrap/$file_name" done +pct exec "$CT_ID" -- mkdir -p /root/bootstrap/settings +pct push "$CT_ID" "$PROJECT_ROOT/aw-server/settings/classes-worktime.json" "/root/bootstrap/settings/classes-worktime.json" +pct push "$CT_ID" "$PROJECT_ROOT/aw-server/settings/views-default.json" "/root/bootstrap/settings/views-default.json" + if [ -n "${AW_SERVER_VERSION:-}" ] && [ -n "${AW_SERVER_DOWNLOAD_URL:-}" ] && [ -n "${AW_SERVER_BIND_HOST:-}" ] &&