Add new and cleanup example data in elk dir, cleanup layout

MetroStar · Apr 15, 2024 · c936566 · c936566
1 parent 9ddf624
commit c936566
Show file tree

Hide file tree

Showing 85 changed files with 478 additions and 78 deletions.
diff --git a/.github/workflows/paradrop.yml b/.github/workflows/paradrop.yml
@@ -32,7 +32,7 @@ jobs:
 
       - name: Provision Paradrop Stack with Seed Data
         run: |
-          make docker
+          make local
 
       - name: Test with Python unittest
         run: |

diff --git a/Makefile b/Makefile
@@ -3,7 +3,7 @@ UI_NAME := paradrop_ui
 
 .PHONY: api elk superlinter develop docs
 
-default: docker
+default: local
 
 mkcert:
 	openssl req -x509 -newkey rsa:4096 -nodes -keyout ui/localhost.key -out ui/localhost.pem -days 365 -sha256 -subj '/CN=127.0.0.1' -addext 'subjectAltName=IP:127.0.0.1'
@@ -15,7 +15,7 @@ npm:
 docs:
 	cd docs && npm install
 
-docker: npm mkcert docs
+local: npm mkcert docs
 	sudo docker compose down --remove-orphans
 	sudo URL='https:\/\/localhost:8443' docker compose up --build -d
 	sleep 60

diff --git a/paradrop-agent/.github/workflows/go.yml → agent/.github/workflows/go.yml b/paradrop-agent/.github/workflows/go.yml → agent/.github/workflows/go.yml
diff --git a/paradrop-agent/.gitignore → agent/.gitignore b/paradrop-agent/.gitignore → agent/.gitignore
diff --git a/paradrop-agent/Dockerfile → agent/Dockerfile b/paradrop-agent/Dockerfile → agent/Dockerfile
diff --git a/paradrop-agent/Dockerfile-pkgs → agent/Dockerfile-pkgs b/paradrop-agent/Dockerfile-pkgs → agent/Dockerfile-pkgs
diff --git a/paradrop-agent/LICENSE → agent/LICENSE b/paradrop-agent/LICENSE → agent/LICENSE
diff --git a/paradrop-agent/Makefile → agent/Makefile b/paradrop-agent/Makefile → agent/Makefile
diff --git a/paradrop-agent/README.md → agent/README.md b/paradrop-agent/README.md → agent/README.md
@@ -421,7 +421,7 @@ make build
 To build the binary with Docker run the following command:
 
 ```sh
-make docker
+make local
 ```
 
 To build the RPM and Deb packages with Docker run the following command:

diff --git a/paradrop-agent/Vagrantfile → agent/Vagrantfile b/paradrop-agent/Vagrantfile → agent/Vagrantfile
diff --git a/paradrop-agent/cloud/aws.go → agent/cloud/aws.go b/paradrop-agent/cloud/aws.go → agent/cloud/aws.go
diff --git a/paradrop-agent/cloud/detect.go → agent/cloud/detect.go b/paradrop-agent/cloud/detect.go → agent/cloud/detect.go
diff --git a/paradrop-agent/config/config.go → agent/config/config.go b/paradrop-agent/config/config.go → agent/config/config.go
diff --git a/paradrop-agent/config/tags.go → agent/config/tags.go b/paradrop-agent/config/tags.go → agent/config/tags.go
diff --git a/paradrop-agent/containers/docker.go → agent/containers/docker.go b/paradrop-agent/containers/docker.go → agent/containers/docker.go
diff --git a/paradrop-agent/data/discoverjson.go → agent/data/discoverjson.go b/paradrop-agent/data/discoverjson.go → agent/data/discoverjson.go
diff --git a/paradrop-agent/gitleaks.toml → agent/gitleaks.toml b/paradrop-agent/gitleaks.toml → agent/gitleaks.toml
diff --git a/paradrop-agent/go.mod → agent/go.mod b/paradrop-agent/go.mod → agent/go.mod
diff --git a/paradrop-agent/go.sum → agent/go.sum b/paradrop-agent/go.sum → agent/go.sum
diff --git a/paradrop-agent/main.go → agent/main.go b/paradrop-agent/main.go → agent/main.go
diff --git a/paradrop-agent/mapping.json → agent/mapping.json b/paradrop-agent/mapping.json → agent/mapping.json
diff --git a/paradrop-agent/network/conns.go → agent/network/conns.go b/paradrop-agent/network/conns.go → agent/network/conns.go
diff --git a/paradrop-agent/network/domainname.go → agent/network/domainname.go b/paradrop-agent/network/domainname.go → agent/network/domainname.go
diff --git a/paradrop-agent/network/ip.go → agent/network/ip.go b/paradrop-agent/network/ip.go → agent/network/ip.go
diff --git a/paradrop-agent/network/iproutes.go → agent/network/iproutes.go b/paradrop-agent/network/iproutes.go → agent/network/iproutes.go
diff --git a/paradrop-agent/network/iptables.go → agent/network/iptables.go b/paradrop-agent/network/iptables.go → agent/network/iptables.go
diff --git a/paradrop-agent/network/nameservers.go → agent/network/nameservers.go b/paradrop-agent/network/nameservers.go → agent/network/nameservers.go
diff --git a/paradrop-agent/network/netstats.go → agent/network/netstats.go b/paradrop-agent/network/netstats.go → agent/network/netstats.go
diff --git a/paradrop-agent/network/ntp.go → agent/network/ntp.go b/paradrop-agent/network/ntp.go → agent/network/ntp.go
diff --git a/paradrop-agent/packages/deb.go → agent/packages/deb.go b/paradrop-agent/packages/deb.go → agent/packages/deb.go
diff --git a/paradrop-agent/packages/gem.go → agent/packages/gem.go b/paradrop-agent/packages/gem.go → agent/packages/gem.go
diff --git a/paradrop-agent/packages/pip.go → agent/packages/pip.go b/paradrop-agent/packages/pip.go → agent/packages/pip.go
diff --git a/paradrop-agent/packages/rpm.go → agent/packages/rpm.go b/paradrop-agent/packages/rpm.go → agent/packages/rpm.go
diff --git a/paradrop-agent/packages/snap.go → agent/packages/snap.go b/paradrop-agent/packages/snap.go → agent/packages/snap.go
diff --git a/paradrop-agent/packages/windows_darwin.go → agent/packages/windows_darwin.go b/paradrop-agent/packages/windows_darwin.go → agent/packages/windows_darwin.go
diff --git a/paradrop-agent/packages/windows_linux.go → agent/packages/windows_linux.go b/paradrop-agent/packages/windows_linux.go → agent/packages/windows_linux.go
diff --git a/paradrop-agent/packages/windows_windows.go → agent/packages/windows_windows.go b/paradrop-agent/packages/windows_windows.go → agent/packages/windows_windows.go
diff --git a/paradrop-agent/packaging/cmon.service → agent/packaging/cmon.service b/paradrop-agent/packaging/cmon.service → agent/packaging/cmon.service
diff --git a/paradrop-agent/packaging/install.sh → agent/packaging/install.sh b/paradrop-agent/packaging/install.sh → agent/packaging/install.sh
diff --git a/paradrop-agent/packaging/package.sh → agent/packaging/package.sh b/paradrop-agent/packaging/package.sh → agent/packaging/package.sh
diff --git a/paradrop-agent/packaging/uninstall.sh → agent/packaging/uninstall.sh b/paradrop-agent/packaging/uninstall.sh → agent/packaging/uninstall.sh
diff --git a/paradrop-agent/security/certs.go → agent/security/certs.go b/paradrop-agent/security/certs.go → agent/security/certs.go
diff --git a/paradrop-agent/security/clamav.go → agent/security/clamav.go b/paradrop-agent/security/clamav.go → agent/security/clamav.go
diff --git a/paradrop-agent/security/cpu.go → agent/security/cpu.go b/paradrop-agent/security/cpu.go → agent/security/cpu.go
diff --git a/paradrop-agent/security/logins.go → agent/security/logins.go b/paradrop-agent/security/logins.go → agent/security/logins.go
diff --git a/paradrop-agent/security/oscap.go → agent/security/oscap.go b/paradrop-agent/security/oscap.go → agent/security/oscap.go
diff --git a/paradrop-agent/security/trivy.go → agent/security/trivy.go b/paradrop-agent/security/trivy.go → agent/security/trivy.go
diff --git a/paradrop-agent/shipper/shipper.go → agent/shipper/shipper.go b/paradrop-agent/shipper/shipper.go → agent/shipper/shipper.go
diff --git a/paradrop-agent/start.sh → agent/start.sh b/paradrop-agent/start.sh → agent/start.sh
diff --git a/paradrop-agent/system/audit.go → agent/system/audit.go b/paradrop-agent/system/audit.go → agent/system/audit.go
diff --git a/paradrop-agent/system/chassistype.go → agent/system/chassistype.go b/paradrop-agent/system/chassistype.go → agent/system/chassistype.go
diff --git a/paradrop-agent/system/cron.go → agent/system/cron.go b/paradrop-agent/system/cron.go → agent/system/cron.go
diff --git a/paradrop-agent/system/dmesg.go → agent/system/dmesg.go b/paradrop-agent/system/dmesg.go → agent/system/dmesg.go
diff --git a/paradrop-agent/system/host_id.go → agent/system/host_id.go b/paradrop-agent/system/host_id.go → agent/system/host_id.go
diff --git a/paradrop-agent/system/journalctl.go → agent/system/journalctl.go b/paradrop-agent/system/journalctl.go → agent/system/journalctl.go
diff --git a/paradrop-agent/system/lsmod.go → agent/system/lsmod.go b/paradrop-agent/system/lsmod.go → agent/system/lsmod.go
diff --git a/paradrop-agent/system/processes.go → agent/system/processes.go b/paradrop-agent/system/processes.go → agent/system/processes.go
diff --git a/paradrop-agent/system/stats.go → agent/system/stats.go b/paradrop-agent/system/stats.go → agent/system/stats.go
diff --git a/paradrop-agent/system/sysctl.go → agent/system/sysctl.go b/paradrop-agent/system/sysctl.go → agent/system/sysctl.go
diff --git a/paradrop-agent/system/systemctl.go → agent/system/systemctl.go b/paradrop-agent/system/systemctl.go → agent/system/systemctl.go
diff --git a/paradrop-agent/system/systemdtimers.go → agent/system/systemdtimers.go b/paradrop-agent/system/systemdtimers.go → agent/system/systemdtimers.go
diff --git a/paradrop-agent/system/timezone.go → agent/system/timezone.go b/paradrop-agent/system/timezone.go → agent/system/timezone.go
diff --git a/paradrop-agent/system/users.go → agent/system/users.go b/paradrop-agent/system/users.go → agent/system/users.go
diff --git a/paradrop-agent/util/cmd.go → agent/util/cmd.go b/paradrop-agent/util/cmd.go → agent/util/cmd.go
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -13,7 +13,7 @@ services:
       - paradrop
     ports:
       - 127.0.0.1:9200:9200
-    restart: always
+    restart: unless-stopped
     volumes:
       - ./elk/internal_users.yml:/usr/share/opensearch/config/opensearch-security/internal_users.yml:rw
 
@@ -29,9 +29,9 @@ services:
       - paradrop
     ports:
       - 127.0.0.1:5601:5601
-    restart: always
+    restart: unless-stopped
     volumes:
-    - ./elk/opensearch_dashboards.yml:/usr/share/opensearch-dashboards/config/opensearch_dashboards.yml:ro
+      - ./elk/opensearch_dashboards.yml:/usr/share/opensearch-dashboards/config/opensearch_dashboards.yml:ro
 
   api:
     build:
@@ -44,7 +44,7 @@ services:
       - paradrop
     ports:
       - 127.0.0.1:5000:5000
-    restart: always
+    restart: unless-stopped
 
   ui:
     build:
@@ -61,7 +61,7 @@ services:
       - paradrop
     ports:
       - 8443:8443
-    restart: always
+    restart: unless-stopped
 
   docs:
     build:
@@ -74,7 +74,7 @@ services:
       - paradrop
     ports:
       - 127.0.0.1:3008:3008
-    restart: always
+    restart: unless-stopped
 
 networks:
   paradrop:

diff --git a/elk/demo.paradrop.io.json → elk/hosts/demo.paradrop.io.json b/elk/demo.paradrop.io.json → elk/hosts/demo.paradrop.io.json
diff --git a/elk/desktop-clear-1.json → elk/hosts/desktop-clear-1.json b/elk/desktop-clear-1.json → elk/hosts/desktop-clear-1.json
diff --git a/elk/desktop-win10-1.json → elk/hosts/desktop-win10-1.json b/elk/desktop-win10-1.json → elk/hosts/desktop-win10-1.json
diff --git a/elk/desktop-win11-1.json → elk/hosts/desktop-win11-1.json b/elk/desktop-win11-1.json → elk/hosts/desktop-win11-1.json
diff --git a/elk/notebook-ubuntu20-1.json → elk/hosts/notebook-ubuntu20-1.json b/elk/notebook-ubuntu20-1.json → elk/hosts/notebook-ubuntu20-1.json
diff --git a/elk/pi4-ubuntu20-1.json → elk/hosts/pi4-ubuntu20-1.json b/elk/pi4-ubuntu20-1.json → elk/hosts/pi4-ubuntu20-1.json
diff --git a/elk/vm-centos8-1.json → elk/hosts/vm-centos8-1.json b/elk/vm-centos8-1.json → elk/hosts/vm-centos8-1.json
diff --git a/elk/vm-centos9-1.json → elk/hosts/vm-centos9-1.json b/elk/vm-centos9-1.json → elk/hosts/vm-centos9-1.json
diff --git a/elk/vm-rocky9-1.json → elk/hosts/vm-rocky9-1.json b/elk/vm-rocky9-1.json → elk/hosts/vm-rocky9-1.json
diff --git a/elk/vm-winsrv2022-1.json → elk/hosts/vm-winsrv2022-1.json b/elk/vm-winsrv2022-1.json → elk/hosts/vm-winsrv2022-1.json
diff --git a/elk/paradrop_audit_mapping.json → elk/mappings/paradrop_audit_mapping.json b/elk/paradrop_audit_mapping.json → elk/mappings/paradrop_audit_mapping.json
diff --git a/elk/paradrop_changes_mapping.json → elk/mappings/paradrop_changes_mapping.json b/elk/paradrop_changes_mapping.json → elk/mappings/paradrop_changes_mapping.json
diff --git a/elk/paradrop_event_triggers_mapping.json → ...ings/paradrop_event_triggers_mapping.json b/elk/paradrop_event_triggers_mapping.json → ...ings/paradrop_event_triggers_mapping.json
diff --git a/elk/paradrop_events_mapping.json → elk/mappings/paradrop_events_mapping.json b/elk/paradrop_events_mapping.json → elk/mappings/paradrop_events_mapping.json
diff --git a/elk/paradrop_hosts_mapping.json → elk/mappings/paradrop_hosts_mapping.json b/elk/paradrop_hosts_mapping.json → elk/mappings/paradrop_hosts_mapping.json
diff --git a/elk/paradrop_reports_mapping.json → elk/mappings/paradrop_reports_mapping.json b/elk/paradrop_reports_mapping.json → elk/mappings/paradrop_reports_mapping.json
diff --git a/elk/paradrop_users_mapping.json → elk/mappings/paradrop_users_mapping.json b/elk/paradrop_users_mapping.json → elk/mappings/paradrop_users_mapping.json
diff --git a/elk/seed.sh b/elk/seed.sh
diff --git a/elk/seed_test_data.py b/elk/seed_test_data.py
@@ -2,7 +2,7 @@
 # autopep8: off
 import json, time, sys, os.path
 from string import ascii_letters
-from random import randint
+from random import randint, choices
 from datetime import datetime, timezone
 
 # Changing path from paradrop/elk to paradrop/api to be able to import things from that folder

diff --git a/ui/event-triggers/index.html b/ui/event-triggers/index.html
@@ -201,10 +201,10 @@ <h4 class="modal-title" id="modalTitle">Add Event Trigger</h4>
                           <option value="memoryused_pct">memoryused_pct</option>
                           <option value="memoryfree_gb">memoryfree_gb</option>
                           <option value="ntp_running-bool">ntp_running</option>
-                          <option value="openscap['error_total]">openscap['error_total]</option>
-                          <option value="openscap['fail_total]">openscap['fail_total]</option>
+                          <option value="openscap['error_total']">openscap['error_total']</option>
+                          <option value="openscap['fail_total']">openscap['fail_total']</option>
                           <option value="openscap['informational_total']">openscap['informational_total']</option>
-                          <option value="openscap['unknown_total]">openscap['unknown_total]</option>
+                          <option value="openscap['unknown_total']">openscap['unknown_total']</option>
                           <option value="sysctl">sysctl</option>
                           <option value="systemctl_failed">systemctl_failed</option>
                           <option value="trivy['vulnerabilities_critical']">trivy['vulnerabilities_critical']</option>