From b2d85b843ff59f8959b33ddb0ab9f250b4a53e37 Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Tue, 14 Feb 2023 09:00:10 -0500 Subject: [PATCH 01/83] reposync --- salt/common/tools/sbin/so-common | 14 +++++++++----- salt/common/tools/sbin/so-repo-sync | 16 ++++++++++++++++ setup/so-functions | 2 ++ 3 files changed, 27 insertions(+), 5 deletions(-) create mode 100644 salt/common/tools/sbin/so-repo-sync diff --git a/salt/common/tools/sbin/so-common b/salt/common/tools/sbin/so-common index c4a3fdbaf..01e278a6a 100755 --- a/salt/common/tools/sbin/so-common +++ b/salt/common/tools/sbin/so-common @@ -366,12 +366,16 @@ run_check_net_err() { fi } +salt_minion_count() + local MINIONDIR="/opt/so/saltstack/local/pillar/minions" + MINIONCOUNT=$(ls -la $MINIONDIR/*.sls | grep sls | wc -l) + set_cron_service_name() { - if [[ "$OS" == "centos" ]]; then - cron_service_name="crond" - else - cron_service_name="cron" - fi + if [[ "$OS" == "centos" ]]; then + cron_service_name="crond" + else + cron_service_name="cron" + fi } set_os() { diff --git a/salt/common/tools/sbin/so-repo-sync b/salt/common/tools/sbin/so-repo-sync new file mode 100644 index 000000000..67adb46ff --- /dev/null +++ b/salt/common/tools/sbin/so-repo-sync @@ -0,0 +1,16 @@ +#!/bin/bash +# +# Copyright Security Onion Solutions LLC and/or licensed to Security Onion Solutions LLC under one +# or more contributor license agreements. Licensed under the Elastic License 2.0 as shown at +# https://securityonion.net/license; you may not use this file except in compliance with the +# Elastic License 2.0. + +. /usr/sbin/so-common + +set_version +set_os +salt_minion_count + +curl --retry 5 --retry-delay 60 -A 'checkin/$VERSION/$OS/$(uname -r)/$MINIONCOUNT' https://sigs.securityonion.net/checkup --output /tmp/checkup" +reposync --norepopath -n -g -l -d -m -c /root/repodownload.conf -r securityonionsync --download-metadata -p /nsm/repo/" + \ No newline at end of file diff --git a/setup/so-functions b/setup/so-functions index 0dc4751bd..80ddfd68a 100755 --- a/setup/so-functions +++ b/setup/so-functions @@ -1973,6 +1973,8 @@ repo_sync_local() { info "We have what we need to sync" fi + # Make sure we can get to the sig repo + logCmd "curl --retry 5 --retry-delay 60 -A 'gridinstall/$SOVERSION/$OS/$(uname -r)' https://sigs.securityonion.net/checkup --output /tmp/checkup" logCmd "reposync --norepopath -n -g -l -d -m -c /root/repodownload.conf -r securityonionsync --download-metadata -p /nsm/repo/" From 89bd9163fbf76acfe2949c81a2ad16de84897cd9 Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Tue, 14 Feb 2023 10:08:34 -0500 Subject: [PATCH 02/83] reposync attempt for reocky --- salt/common/tools/sbin/so-common | 12 +++--- .../client/files/rocky/RPM-GPG-KEY-EPEL-9 | 29 +++++++++++++ .../client/files/rocky/SALTSTACK-GPG-KEY2.pub | 31 +++++++++++++ setup/so-functions | 43 ++++++++----------- 4 files changed, 83 insertions(+), 32 deletions(-) create mode 100644 salt/repo/client/files/rocky/RPM-GPG-KEY-EPEL-9 create mode 100644 salt/repo/client/files/rocky/SALTSTACK-GPG-KEY2.pub diff --git a/salt/common/tools/sbin/so-common b/salt/common/tools/sbin/so-common index 01e278a6a..fbe9a9700 100755 --- a/salt/common/tools/sbin/so-common +++ b/salt/common/tools/sbin/so-common @@ -187,14 +187,14 @@ get_random_value() { } gpg_rpm_import() { - if [[ "$OS" == "centos" ]]; then + if [[ "$OS" == "rocky" ]]; then if [[ "$WHATWOULDYOUSAYYAHDOHERE" == "setup" ]]; then - local RPMKEYSLOC="../salt/repo/client/files/centos/keys" + local RPMKEYSLOC="../salt/repo/client/files/rocky/keys" else - local RPMKEYSLOC="$UPDATE_DIR/salt/repo/client/files/centos/keys" + local RPMKEYSLOC="$UPDATE_DIR/salt/repo/client/files/rocky/keys" fi - RPMKEYS=('RPM-GPG-KEY-EPEL-7' 'docker.pub' 'SALTSTACK-GPG-KEY.pub' 'securityonion.pub') + RPMKEYS=('RPM-GPG-KEY-EPEL-9' 'SALTSTACK-GPG-KEY2.pub' 'securityonion.pub') for RPMKEY in "${RPMKEYS[@]}"; do rpm --import $RPMKEYSLOC/$RPMKEY @@ -371,7 +371,7 @@ salt_minion_count() MINIONCOUNT=$(ls -la $MINIONDIR/*.sls | grep sls | wc -l) set_cron_service_name() { - if [[ "$OS" == "centos" ]]; then + if [[ "$OS" == "rocky" ]]; then cron_service_name="crond" else cron_service_name="cron" @@ -380,7 +380,7 @@ set_cron_service_name() { set_os() { if [ -f /etc/redhat-release ]; then - OS=centos + OS=rocky else OS=ubuntu fi diff --git a/salt/repo/client/files/rocky/RPM-GPG-KEY-EPEL-9 b/salt/repo/client/files/rocky/RPM-GPG-KEY-EPEL-9 new file mode 100644 index 000000000..0cc05ecb3 --- /dev/null +++ b/salt/repo/client/files/rocky/RPM-GPG-KEY-EPEL-9 @@ -0,0 +1,29 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +mQINBGE3mOsBEACsU+XwJWDJVkItBaugXhXIIkb9oe+7aadELuVo0kBmc3HXt/Yp +CJW9hHEiGZ6z2jwgPqyJjZhCvcAWvgzKcvqE+9i0NItV1rzfxrBe2BtUtZmVcuE6 +2b+SPfxQ2Hr8llaawRjt8BCFX/ZzM4/1Qk+EzlfTcEcpkMf6wdO7kD6ulBk/tbsW +DHX2lNcxszTf+XP9HXHWJlA2xBfP+Dk4gl4DnO2Y1xR0OSywE/QtvEbN5cY94ieu +n7CBy29AleMhmbnx9pw3NyxcFIAsEZHJoU4ZW9ulAJ/ogttSyAWeacW7eJGW31/Z +39cS+I4KXJgeGRI20RmpqfH0tuT+X5Da59YpjYxkbhSK3HYBVnNPhoJFUc2j5iKy +XLgkapu1xRnEJhw05kr4LCbud0NTvfecqSqa+59kuVc+zWmfTnGTYc0PXZ6Oa3rK +44UOmE6eAT5zd/ToleDO0VesN+EO7CXfRsm7HWGpABF5wNK3vIEF2uRr2VJMvgqS +9eNwhJyOzoca4xFSwCkc6dACGGkV+CqhufdFBhmcAsUotSxe3zmrBjqA0B/nxIvH +DVgOAMnVCe+Lmv8T0mFgqZSJdIUdKjnOLu/GRFhjDKIak4jeMBMTYpVnU+HhMHLq +uDiZkNEvEEGhBQmZuI8J55F/a6UURnxUwT3piyi3Pmr2IFD7ahBxPzOBCQARAQAB +tCdGZWRvcmEgKGVwZWw5KSA8ZXBlbEBmZWRvcmFwcm9qZWN0Lm9yZz6JAk4EEwEI +ADgWIQT/itE0RZcQbs6BO5GKOHK/MihGfAUCYTeY6wIbDwULCQgHAgYVCgkICwIE +FgIDAQIeAQIXgAAKCRCKOHK/MihGfFX/EACBPWv20+ttYu1A5WvtHJPzwbj0U4yF +3zTQpBglQ2UfkRpYdipTlT3Ih6j5h2VmgRPtINCc/ZE28adrWpBoeFIS2YAKOCLC +nZYtHl2nCoLq1U7FSttUGsZ/t8uGCBgnugTfnIYcmlP1jKKA6RJAclK89evDQX5n +R9ZD+Cq3CBMlttvSTCht0qQVlwycedH8iWyYgP/mF0W35BIn7NuuZwWhgR00n/VG +4nbKPOzTWbsP45awcmivdrS74P6mL84WfkghipdmcoyVb1B8ZP4Y/Ke0RXOnLhNe +CfrXXvuW+Pvg2RTfwRDtehGQPAgXbmLmz2ZkV69RGIr54HJv84NDbqZovRTMr7gL +9k3ciCzXCiYQgM8yAyGHV0KEhFSQ1HV7gMnt9UmxbxBE2pGU7vu3CwjYga5DpwU7 +w5wu1TmM5KgZtZvuWOTDnqDLf0cKoIbW8FeeCOn24elcj32bnQDuF9DPey1mqcvT +/yEo/Ushyz6CVYxN8DGgcy2M9JOsnmjDx02h6qgWGWDuKgb9jZrvRedpAQCeemEd +fhEs6ihqVxRFl16HxC4EVijybhAL76SsM2nbtIqW1apBQJQpXWtQwwdvgTVpdEtE +r4ArVJYX5LrswnWEQMOelugUG6S3ZjMfcyOa/O0364iY73vyVgaYK+2XtT2usMux +VL469Kj5m13T6w== +=Mjs/ +-----END PGP PUBLIC KEY BLOCK----- \ No newline at end of file diff --git a/salt/repo/client/files/rocky/SALTSTACK-GPG-KEY2.pub b/salt/repo/client/files/rocky/SALTSTACK-GPG-KEY2.pub new file mode 100644 index 000000000..bfc7fc267 --- /dev/null +++ b/salt/repo/client/files/rocky/SALTSTACK-GPG-KEY2.pub @@ -0,0 +1,31 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +mQENBGLXV/8BCADCuomk2pibSOuLQeKMIwV3Afy60080hykdc4tU4qQS+zBJZZC0 +VBl2TAOmMWyeY5DRF2ibRTx6Ap8qYefuEjWlo2WHWWZH4WhNkJWL3aWiu8Ga+fFo +ebjoUFLGgpKDGKveO9PF8A41IP1CLvDicpWXTxfqzQKDOvg3g5EmCx+5ksviXHJ1 +lY5CBbhVPmU3ruzGBqN/6B90VyTicbIyIZKZdnElAqaW6OiEaOmj2Oadi3ARJLWA +8rpVPweZE0/S4B5UIuMh+JVJU3Os1BUXHKN3LAPENZa1NNYX3j53GxGMf+SAKe0g +QHe+fHiiB7a6iBl09W8cUJh8HINXW+vvU6mZABEBAAG0MlNhbHRTdGFjayBQYWNr +YWdpbmcgVGVhbSA8cGFja2FnaW5nQHNhbHRzdGFjay5jb20+iQFSBBMBCAA8FiEE +9+rekz4krjI0B2hWN6cQR50w17YFAmLXV/8CGwMFCwkIBwIDIgIBBhUKCQgLAgQW +AgMBAh4HAheAAAoJEDenEEedMNe2d0MH/36khQzCWMc5ezznO7bcOHOS3OWjQveF +Vv60y54QRnINCEa7w7ckjiap3dUSJxTo5eoAKNbgX5SgrshEY1HDXDoqgumHJLFW +J+L4f3CXFBhvObUOwB7ApUNHURcoNQYK7kS/vUJrQ3dFyT7uvgysGtv+/WpboY1s +ScJnVtWyQmLe7qj5pJ0aI5pPjFnP9869zPScNb6o6lbqGp/xhnL5NkZCF0DNgItw +HXyNsRPyc8JG+P+GP80XWZ37ajEdwkiPbtu3CD5pvBO1w5FPLBwuH5CSgQFEcA4V +QH8ThU0P1IhKe3xPRNgawcBTAHXqOD0OxilAIsQdfrKkRiTEcZtFZW25AQ0EYtdX +/wEIANFBzJfSks4ti/JQkECtEAwH7OtqUxu1QhSSRusGsQu/PpjBRZzlaVlKjS4c +fGTiZ8+25RX063vBQ+XpuTN9T9boEE4EywM11FCx1zRZIc+HlLOIJ10uKWUapmPM ++7flnQWXMgJzP47rHe0ofEHlP4/av5C1imgWEtEpYyn1B4qgSxvLFDq46rD5m+DP +2xNZbwWd0uSAG/wZNonVkISYymB0UTnUm8FABH1Ci7lXO9JnuW+IvVt32C5VibGy +FXdAJGmIiqsvBhJSUl+GJhO6NTXntuevqPLUXD9PuHWo4Vo1Afek8kqZByyiyrTZ +StDhrbo/8dSAVQMibLEfNS7R0QkAEQEAAYkBNgQYAQgAIBYhBPfq3pM+JK4yNAdo +VjenEEedMNe2BQJi11f/AhsMAAoJEDenEEedMNe2zhgH/0wxbQpaCho0BRbUbe6L +jm9r3yTWn6M+yYv+cBeH9sbobIVOqTvZcawzTEPWa+eVbKgkqhZjUTyfFDpjq9s6 +67zLZnCh85hLoyieSQBER59dc1pmqZJP3VrAIT1lGKMIdjZoN8JAF8IbmJHE1j65 +iZZdhbxfFHnDx22gQ+3nfniTNTWsfVAQeoAjeOuakPKdfUEMsXPBhtBBuFY4NcrT +TIsBevT4J/STCLkEqlMtYC8ldxUCZqQXdtxqltC4k+y0kp4PmNc3/Vmp65oAeuxI +d8TNwgZdamdinv5mPrTfBqSNiELQAcPQnOwpsqEDYF2pq9L4sdNGavP5ZvPGRLkH ++uU= +=383D +-----END PGP PUBLIC KEY BLOCK----- diff --git a/setup/so-functions b/setup/so-functions index 80ddfd68a..fd1fc4b2d 100755 --- a/setup/so-functions +++ b/setup/so-functions @@ -886,19 +886,13 @@ detect_cloud() { detect_os() { title "Detecting Base OS" if [ -f /etc/redhat-release ]; then - if grep -q "CentOS Linux release 7" /etc/redhat-release; then - OS=centos - OSVER=7 - is_centos=true - pkgman="yum" - elif grep -q "Rocky Linux release 8" /etc/redhat-release; then + if grep -q "Rocky Linux release 9" /etc/redhat-release; then OS=rocky - OSVER=8 + OSVER=9 is_rocky=true pkgman="dnf" - info "We currently do not support Rocky Linux $OSVER but we are working on it!" else - info "We do not support the version of CentOS you are trying to use." + info "We do not support the operating system you are trying to use." exit 1 fi @@ -932,13 +926,10 @@ installer_progress_loop() { } installer_prereq_packages() { - if [ "$OS" == centos ]; then + if [ "$OS" == rocky ]; then if [[ ! $is_iso ]]; then - if ! yum versionlock > /dev/null 2>&1; then - logCmd "yum -y install yum-plugin-versionlock" - fi if ! command -v nmcli > /dev/null 2>&1; then - logCmd "yum -y install NetworkManager" + logCmd "dnf -y install NetworkManager" fi fi logCmd "systemctl enable NetworkManager" @@ -1715,7 +1706,7 @@ proxy_validate() { } reserve_group_ids() { - # This is a hack to fix CentOS from taking group IDs that we need + # This is a hack to fix OS from taking group IDs that we need logCmd "groupadd -g 928 kratos" logCmd "groupadd -g 930 elasticsearch" logCmd "groupadd -g 931 logstash" @@ -1837,8 +1828,8 @@ reset_proxy() { [[ -f /etc/gitconfig ]] && rm -f /etc/gitconfig - if [[ $is_centos ]]; then - sed -i "/proxy=/d" /etc/yum.conf + if [[ $is_rocky ]]; then + sed -i "/proxy=/d" /etc/dnf/dnf.conf else [[ -f /etc/apt/apt.conf.d/00-proxy.conf ]] && rm -f /etc/apt/apt.conf.d/00-proxy.conf fi @@ -1881,9 +1872,9 @@ drop_install_options() { remove_package() { local package_name=$1 - if [[ $is_centos ]]; then + if [[ $is_rocky ]]; then if rpm -qa | grep -q "$package_name"; then - logCmd "yum remove -y $package_name" + logCmd "dnf remove -y $package_name" fi else if dpkg -l | grep -q "$package_name"; then @@ -1908,7 +1899,7 @@ securityonion_repo() { echo "Syncing Repo" repo_sync_local fi - logCmd "yum -v clean all" + logCmd "dnf -v clean all" logCmd "mkdir -vp /root/oldrepos" logCmd "mv -v /etc/yum.repos.d/* /root/oldrepos/" logCmd "ls -la /etc/yum.repos.d/" @@ -1928,13 +1919,13 @@ securityonion_repo() { fi # need to yum clean all before repo conf files are removed or clean,cleans nothing - logCmd "yum repolist all" + logCmd "dnf repolist all" # update this package because the repo config files get added back # if the package is updated when the update_packages function is called - logCmd "yum -v -y update centos-release" + logCmd "dnf -v -y update rocky-release" info "Backing up the .repo files that were added by the centos-release package." - logCmd "mv -bvf /etc/yum.repos.d/CentOS* /root/oldrepos/" - logCmd "yum repolist all" + logCmd "mv -bvf /etc/yum.repos.d/rocky* /root/oldrepos/" + logCmd "dnf repolist all" fi } @@ -1968,14 +1959,14 @@ repo_sync_local() { if [[ ! "$REPOSYNC" -gt 0 ]]; then # Install reposync info "Installing createrepo" - logCmd "yum -y install -c /root/repodownload.conf yum-utils createrepo" + logCmd "dnf -y install -c /root/repodownload.conf createrepo" else info "We have what we need to sync" fi # Make sure we can get to the sig repo logCmd "curl --retry 5 --retry-delay 60 -A 'gridinstall/$SOVERSION/$OS/$(uname -r)' https://sigs.securityonion.net/checkup --output /tmp/checkup" - logCmd "reposync --norepopath -n -g -l -d -m -c /root/repodownload.conf -r securityonionsync --download-metadata -p /nsm/repo/" + logCmd "dnf reposync --norepopath -n -g --delete -m -c /root/repodownload.conf --repoid=securityonionsync --download-metadata -p /nsm/repo/" # After the download is complete run createrepo From 4741038a41fc45283871d05204be4bcbb4cbc244 Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Tue, 14 Feb 2023 10:15:35 -0500 Subject: [PATCH 03/83] fix function --- salt/common/tools/sbin/so-common | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/salt/common/tools/sbin/so-common b/salt/common/tools/sbin/so-common index fbe9a9700..d66a6cc6f 100755 --- a/salt/common/tools/sbin/so-common +++ b/salt/common/tools/sbin/so-common @@ -366,10 +366,12 @@ run_check_net_err() { fi } -salt_minion_count() +salt_minion_count() { local MINIONDIR="/opt/so/saltstack/local/pillar/minions" MINIONCOUNT=$(ls -la $MINIONDIR/*.sls | grep sls | wc -l) +} + set_cron_service_name() { if [[ "$OS" == "rocky" ]]; then cron_service_name="crond" From 0f51e7bb980a41f0fba2e68a73ca2713daf8c55c Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Tue, 14 Feb 2023 13:14:21 -0500 Subject: [PATCH 04/83] fix key locations for rocky --- salt/repo/client/files/rocky/{ => keys}/RPM-GPG-KEY-EPEL-9 | 0 salt/repo/client/files/rocky/{ => keys}/SALTSTACK-GPG-KEY2.pub | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename salt/repo/client/files/rocky/{ => keys}/RPM-GPG-KEY-EPEL-9 (100%) rename salt/repo/client/files/rocky/{ => keys}/SALTSTACK-GPG-KEY2.pub (100%) diff --git a/salt/repo/client/files/rocky/RPM-GPG-KEY-EPEL-9 b/salt/repo/client/files/rocky/keys/RPM-GPG-KEY-EPEL-9 similarity index 100% rename from salt/repo/client/files/rocky/RPM-GPG-KEY-EPEL-9 rename to salt/repo/client/files/rocky/keys/RPM-GPG-KEY-EPEL-9 diff --git a/salt/repo/client/files/rocky/SALTSTACK-GPG-KEY2.pub b/salt/repo/client/files/rocky/keys/SALTSTACK-GPG-KEY2.pub similarity index 100% rename from salt/repo/client/files/rocky/SALTSTACK-GPG-KEY2.pub rename to salt/repo/client/files/rocky/keys/SALTSTACK-GPG-KEY2.pub From 4dcdea58d758ed22b6915f922a59c303e5be40a1 Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Tue, 14 Feb 2023 13:16:13 -0500 Subject: [PATCH 05/83] add key for so packages --- .../client/files/rocky/keys/securityonion.pub | 52 +++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 salt/repo/client/files/rocky/keys/securityonion.pub diff --git a/salt/repo/client/files/rocky/keys/securityonion.pub b/salt/repo/client/files/rocky/keys/securityonion.pub new file mode 100644 index 000000000..15be14ca9 --- /dev/null +++ b/salt/repo/client/files/rocky/keys/securityonion.pub @@ -0,0 +1,52 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +mQINBF7rzwEBEADBg87uJhnC3Ls7s60hbHGaywGrPtbz2WuYA/ev3YS3X7WS75p8 +PGlzTWUCujx0pEHbK2vYfExl3zksZ8ZmLyZ9VB3oSLiWBzJgKAeB7YCFEo8te+eE +P2Z+8c+kX4eOV+2waxZyewA2TipSkhWgStSI4Ow8SyVUcUWA3hCw7mo2duNVi7KO +C3vvI3wzirH+8/XIGo+lWTg6yYlSxdf+0xWzYvV2QCMpwzJfARw6GGXtfCZw/zoO +o4+YPsiyztQdyI1y+g3Fbesl65E36DelbyP+lYd2VecX8ELEv0wlKCgHYlk6lc+n +qnOotVjWbsyXuFfo06PHUd6O9n3nmo0drC6kmXGw1e8hu0t8VcGfMTKS/hszwVUY +bHS6kbfsOoAb6LXPWKfqxk/BdreLXmcHHz88DimS3OS0JufkcmkjxEzSFRL0kb2h +QVb1SATrbx+v2RWQXvi9sLCjT2fdOiwi1Tgc84orc7A1C3Jwu353YaX9cV+n5uyG +OZ2AULZ5z2h13sVuiZAwfyyFs/O0CJ783hFA2TNPnyNGAgw/kaIo7nNRnggtndBo +oQzVS+BHiFx98IF4zDqmF2r2+jOCjxSrw8KnZBe4bgXFtl89DmjoejGvWDnu2MVM +pZDEs1DcOxHBQmTCWMIYLyNKG0xW6diyWBxEIaa7YgrP6kA+RaDfZ/xXPwARAQAB +tD9TZWN1cml0eSBPbmlvbiBTb2x1dGlvbnMsIExMQyA8aW5mb0BzZWN1cml0eW9u +aW9uc29sdXRpb25zLmNvbT6JAlQEEwEKAD4WIQTIBKk9Nr4Mcz6hlkR8EGC3/lBw +EwUCXuvPAQIbAwUJEswDAAULCQgHAgYVCgkICwIEFgIDAQIeAQIXgAAKCRB8EGC3 +/lBwExB1D/42xIDGU2XFNFyTU+ZqzDA8qNC9hEKjLeizbeM8RIm3xO+3p7SdqbuJ +7pA8gk0RiHuILb+Ba1xiSh/w/W2bOxQhsXuWHih2z3W1tI+hu6RQhIm4e6CIHHf7 +Vzj4RSvHOVS0AzITUwkHjv0x0Z8zVBPJfEHKkK2x03BqP1o12rd7n2ZMrSfN6sED +fUwOJLDjthShtyLSPBVG8j7T5cfSCPSLhfVOKPQVcI1sSir7RLeyxt1v1kzjQdaA ++znxO8EgfZJN93wzfBrAGcVT8KmpmgwR6p46m20wJXyZC9DZxJ0o1y3toVWTC+kP +Qj1ROPivySVn10rBoOJk8HteyhW07gTcydq+noKHV7SqJ1899xRAYP7rDCfI9iMW +Nn22ZDLnAkIcbNR7JLJCHwsZH/Umo9KO/dIccIqVQel3UCCYZcWTZW0VkcjqVKRa +eK+JQGaJPrBAoxIG5/sMlbk2sINSubNWlcbH6kM0V8NVwdPiOO9xLmp2hI4ICxE3 +M+O2HCNX4QYzVizzTFxEvW3ieLa4nePQ8J6lvMI2oLkFP7xHoFluvZnuwfNvoEy0 +RnlHExN1UQTUvcbCxIbzjaJ4HJXilWHjgmGaVQO1S7AYskWnNWQ7uJvxnuZBNNwm +pIvwYEZp23fYaWl/xKqnmPMy2ADjROBKlCm7L+Ntq1r7ELGW5ZCTobkCDQRe688B +ARAA22GzdkSAo+mwJ2S1RbJ1G20tFnLsG/NC8iMN3lEh/PSmyPdB7mBtjZ+HPDzF +VSznXZdr3LItBBQOli2hVIj1lZBY7+s2ZufV3TFFwselUwT3b1g1KMkopD95Ckf8 +WhLbSz2yqgrvcEvbB0HFX/ZEsHGqIz2kLacixjwXXLWOMQ2LNbeW1f5zQkBnaNNQ +/4njzTj68OxnvfplNYNJqi2pZGb2UqarYX04FqKNuocN8E7AC9FQdBXylmVctw9T +pQVwfCI76bTe6vPWb+keb6UNN1jyXVnhIQ3Fv5sFBsmgXf/hO8tqCotrKjEiK2/i +RkvFeqsGMXreCgYg9zW4k+DcJtVa+Q8juGOjElrubY3Ua9mCusx3vY4QYSWxQ5Ih +k1lXiUcM5Rt38lfpKHRJ5Pd4Y5xlWSQfZ7nmzbf/GzJQz+rWrA0X6Oc6cDOPLNXK +w1dAygre4f2bsp5kHQt6NMefxeNTDmi+4R62K0tb40f5q0Vxz8qdyD48bBsbULNx +kb6mjOAD+FNkfNXcGeuTq9oRnjx8i93mhYsIP5LFNDXS/zSP1nv0ZUFeIlGQGjV9 +1wOvT454qkI9sKiVFtd4FrNKZJbKszxxDm+DPfB5j+hRC4oeEJ7w+sVyh3EawtfM +V7Mwj8i+7c3YUCravXBhSwG7SCTggFUgA8lMr8oWVgCATYsAEQEAAYkCPAQYAQoA +JhYhBMgEqT02vgxzPqGWRHwQYLf+UHATBQJe688BAhsMBQkSzAMAAAoJEHwQYLf+ +UHATTtwQAJiztPW68ykifpFdwYFp1VC7c+uGLhWBqjDY9NSUKNC9caR7bV0cnNu8 +07UG6j18gCB2GSkukXjOR/oTj6rNcW/WouPYfQOrw7+M2Ya8M8iq+E/HOXaXB3b4 +FeCcB0UuwfcHHd2KbXrRHA+9GNpmuOcfTCdsPpIr41Xg4QltATDEt/FrzuKspXg4 +vUKDXgfnbj7y0JcJM2FfcwWGlnAG5MMRyjJQAleGdiidX/9WxgJ4Mweq4qJM0jr3 +Qsrc9VuzxsLr85no3Hn5UYVgT7bBZ59HUbQoi775m78MxN3mWUSdcyLQKovI+YXr +tshTxWIf/2Ovdzt6Wq1WWXOGGuK1qgdPJTFWrlh3amFdb70zR1p6A/Lthd7Zty+n +QjRZRQo5jBSnYtjhMrZP6rxM3QqnQ0frEKK9HfDYONk1Bw18CUtdwFGb9OMregLR +IjvNLp9coSh5yYAepZyUGEPRET0GsmVw2trQF0uyMSkQfiq2zjPto6WWbsmrrbLr +cfZ/wnBw1FoNEd51U54euo9yvOgOVtJGvqLgHNwB8574FhQhoWAMhyizqdgeEt26 +m3FXecUNKL/AK71/l04vor+/WsXe8uhDg3O84qeYa9wgd8LZZVmGZJDosSwqYjtb +LdNNm+v60Zo6rFWSREegqi/nRTTDdxdW99ybjlh+mpbq3xavyFXF +=bhkm +-----END PGP PUBLIC KEY BLOCK----- From 4c2142b181db09f646604bfed8a7bcd7db8d8cc2 Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Tue, 14 Feb 2023 13:21:37 -0500 Subject: [PATCH 06/83] add key for so packages --- setup/so-functions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup/so-functions b/setup/so-functions index fd1fc4b2d..f4df47794 100755 --- a/setup/so-functions +++ b/setup/so-functions @@ -1893,7 +1893,7 @@ remove_package() { securityonion_repo() { # Remove all the current repos - if [[ $is_centos ]]; then + if [[ $is_rocky ]]; then if [[ $waitforstate ]]; then # Build the repo locally so we can use it echo "Syncing Repo" From 2cddcc8b8d2d488983ae87337198a203a1066868 Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Tue, 14 Feb 2023 13:38:28 -0500 Subject: [PATCH 07/83] Change some order in repo sync --- setup/so-functions | 38 +++++++++++++++++--------------------- 1 file changed, 17 insertions(+), 21 deletions(-) diff --git a/setup/so-functions b/setup/so-functions index f4df47794..552a19ce7 100755 --- a/setup/so-functions +++ b/setup/so-functions @@ -1894,11 +1894,6 @@ remove_package() { securityonion_repo() { # Remove all the current repos if [[ $is_rocky ]]; then - if [[ $waitforstate ]]; then - # Build the repo locally so we can use it - echo "Syncing Repo" - repo_sync_local - fi logCmd "dnf -v clean all" logCmd "mkdir -vp /root/oldrepos" logCmd "mv -v /etc/yum.repos.d/* /root/oldrepos/" @@ -1922,10 +1917,16 @@ securityonion_repo() { logCmd "dnf repolist all" # update this package because the repo config files get added back # if the package is updated when the update_packages function is called - logCmd "dnf -v -y update rocky-release" - info "Backing up the .repo files that were added by the centos-release package." - logCmd "mv -bvf /etc/yum.repos.d/rocky* /root/oldrepos/" - logCmd "dnf repolist all" + if [ -f "/etc/yum.repos.d/rocky.repo" ]; then + info "Backing up the .repo files that were added by the centos-release package." + logCmd "mv -bvf /etc/yum.repos.d/rocky* /root/oldrepos/" + logCmd "dnf repolist all" + fi + if [[ $waitforstate ]]; then + # Build the repo locally so we can use it + echo "Syncing Repo" + repo_sync_local + fi fi } @@ -1936,21 +1937,16 @@ repo_sync_local() { mkdir -p /nsm/repo mkdir -p /root/reposync_cache echo "[main]" > /root/repodownload.conf + echo "gpgcheck=1" >> /root/repodownload.conf + echo "installonly_limit=3" >> /root/repodownload.conf + echo "clean_requirements_on_remove=True" >> /root/repodownload.conf + echo "best=True" >> /root/repodownload.conf + echo "skip_if_unavailable=False" >> /root/repodownload.conf echo "cachedir=/root/reposync_cache" >> /root/repodownload.conf echo "keepcache=0" >> /root/repodownload.conf - echo "debuglevel=2" >> /root/repodownload.conf - echo "logfile=/var/log/yum.log" >> /root/repodownload.conf - echo "exactarch=1" >> /root/repodownload.conf - echo "obsoletes=1" >> /root/repodownload.conf - echo "gpgcheck=1" >> /root/repodownload.conf - echo "plugins=1" >> /root/repodownload.conf - echo "installonly_limit=2" >> /root/repodownload.conf - echo "bugtracker_url=http://bugs.centos.org/set_project.php?project_id=23&ref=http://bugs.centos.org/bug_report_page.php?category=yum" >> /root/repodownload.conf - echo "distroverpkg=centos-release" >> /root/repodownload.conf - echo "clean_requirements_on_remove=1" >> /root/repodownload.conf echo "[securityonionsync]" >> /root/repodownload.conf echo "name=Security Onion Repo repo" >> /root/repodownload.conf - echo "baseurl=https://repo.securityonion.net/file/securityonion-repo/c7so/" >> /root/repodownload.conf + echo "baseurl=https://repo.securityonion.net/file/securityonion-repo/2,4/" >> /root/repodownload.conf echo "enabled=1" >> /root/repodownload.conf echo "gpgcheck=1" >> /root/repodownload.conf echo "gpgkey=https://repo.securityonion.net/file/securityonion-repo/keys/securityonion.pub" >> /root/repodownload.conf @@ -1963,7 +1959,7 @@ repo_sync_local() { else info "We have what we need to sync" fi - + dnf repolist # Make sure we can get to the sig repo logCmd "curl --retry 5 --retry-delay 60 -A 'gridinstall/$SOVERSION/$OS/$(uname -r)' https://sigs.securityonion.net/checkup --output /tmp/checkup" logCmd "dnf reposync --norepopath -n -g --delete -m -c /root/repodownload.conf --repoid=securityonionsync --download-metadata -p /nsm/repo/" From 577e3c27fef21df64827624bcea67e55063774f9 Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Tue, 14 Feb 2023 13:52:21 -0500 Subject: [PATCH 08/83] Update repo URL --- setup/so-functions | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup/so-functions b/setup/so-functions index 552a19ce7..677bb6da6 100755 --- a/setup/so-functions +++ b/setup/so-functions @@ -1946,7 +1946,7 @@ repo_sync_local() { echo "keepcache=0" >> /root/repodownload.conf echo "[securityonionsync]" >> /root/repodownload.conf echo "name=Security Onion Repo repo" >> /root/repodownload.conf - echo "baseurl=https://repo.securityonion.net/file/securityonion-repo/2,4/" >> /root/repodownload.conf + echo "baseurl=https://repo.securityonion.net/file/securityonion-repo/2.4/" >> /root/repodownload.conf echo "enabled=1" >> /root/repodownload.conf echo "gpgcheck=1" >> /root/repodownload.conf echo "gpgkey=https://repo.securityonion.net/file/securityonion-repo/keys/securityonion.pub" >> /root/repodownload.conf @@ -1961,7 +1961,7 @@ repo_sync_local() { fi dnf repolist # Make sure we can get to the sig repo - logCmd "curl --retry 5 --retry-delay 60 -A 'gridinstall/$SOVERSION/$OS/$(uname -r)' https://sigs.securityonion.net/checkup --output /tmp/checkup" + logCmd "curl --retry 5 --retry-delay 60 -A 'gridinstall/$SOVERSION/$OS/$(uname -r)/1' https://sigs.securityonion.net/checkup --output /tmp/checkup" logCmd "dnf reposync --norepopath -n -g --delete -m -c /root/repodownload.conf --repoid=securityonionsync --download-metadata -p /nsm/repo/" From 01edb5dc003187562b2e723a8433d7a360dca361 Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Wed, 15 Feb 2023 11:09:37 -0500 Subject: [PATCH 09/83] Update repo URL --- setup/so-functions | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/setup/so-functions b/setup/so-functions index 677bb6da6..ad93bc5ba 100755 --- a/setup/so-functions +++ b/setup/so-functions @@ -626,7 +626,7 @@ configure_ntp() { # Install chrony if it isn't already installed if ! command -v chronyc &> /dev/null; then - logCmd "yum -y install chrony" + logCmd "dnf -y install chrony" fi [[ -f $chrony_conf ]] && mv $chrony_conf "$chrony_conf.bak" @@ -2017,10 +2017,10 @@ saltify() { # Install salt if [[ $waitforstate ]]; then # Since this is a salt master so let's install it - logCmd "yum -y install salt-minion salt-master" + logCmd "dnf -y install salt-minion salt-master" else # We just need the minion - logCmd "yum -y install salt-minion" + logCmd "dnf -y install salt-minion" fi fi fi @@ -2358,10 +2358,9 @@ update_sudoers() { } update_packages() { - if [[ $is_centos ]]; then - logCmd "yum repolist" - logCmd "yum -y update --exclude=salt*,wazuh*,docker*,containerd*" - logCmd "yum -y install yum-utils" + if [[ $is_rocky ]]; then + logCmd "dnf repolist" + logCmd "dnf -y update --exclude=salt*,wazuh*,docker*,containerd*" else retry 150 10 "apt-get -y update" >> "$setup_log" 2>&1 || exit 1 retry 150 10 "apt-get -y upgrade" >> "$setup_log" 2>&1 || exit 1 From 405060674c6becad98532a8f3f849bdcc1e28a23 Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Thu, 16 Feb 2023 17:49:07 -0500 Subject: [PATCH 10/83] Salt 3006 temp --- setup/so-functions | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/setup/so-functions b/setup/so-functions index ad93bc5ba..e71caa0a1 100755 --- a/setup/so-functions +++ b/setup/so-functions @@ -617,7 +617,8 @@ configure_minion() { sed -i "s/{{ GLOBALS.main_interface }}/$MNIC/" /etc/salt/minion.d/mine_functions.conf { - systemctl restart salt-minion; + logCmd "systemctl enable salt-minion"; + logCmd "systemctl restart salt-minion"; } >> "$setup_log" 2>&1 } @@ -817,10 +818,10 @@ copy_salt_master_config() { title "Copy the Salt master config template to the proper directory" if [ "$setup_type" = 'iso' ]; then logCmd "cp /root/SecurityOnion/files/salt/master/master /etc/salt/master" - logCmd "cp /root/SecurityOnion/files/salt/master/salt-master.service /usr/lib/systemd/system/salt-master.service" + #logCmd "cp /root/SecurityOnion/files/salt/master/salt-master.service /usr/lib/systemd/system/salt-master.service" else logCmd "cp ../files/salt/master/master /etc/salt/master" - logCmd "cp ../files/salt/master/salt-master.service /usr/lib/systemd/system/salt-master.service" + #logCmd "cp ../files/salt/master/salt-master.service /usr/lib/systemd/system/salt-master.service" fi info "Copying pillar and salt files in $temp_install_dir to $local_salt_dir" logCmd "cp -Rv $temp_install_dir/pillar/ $local_salt_dir/" @@ -830,6 +831,7 @@ copy_salt_master_config() { # Restart the service so it picks up the changes logCmd "systemctl daemon-reload" + logCmd "systemctl enable salt-master" logCmd "systemctl restart salt-master" } @@ -2008,16 +2010,17 @@ saltify() { fi - if [[ $is_centos ]]; then + if [[ $is_rocky ]]; then RUSALTY=$(rpm -qa | grep salt-minion | wc -l) if [[ "$RUSALTY" -gt 0 ]]; then # Salt is already installed. info "salt is installed" else - # Install salt + # THIS IS A TEMP HACK + logCmd "dnf -y install securityonion-salt" if [[ $waitforstate ]]; then # Since this is a salt master so let's install it - logCmd "dnf -y install salt-minion salt-master" + logCmd "" else # We just need the minion logCmd "dnf -y install salt-minion" From 353b77cd5948c628b8d37f11adecad5726b964e2 Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Fri, 17 Feb 2023 10:40:43 -0500 Subject: [PATCH 11/83] add minions.d dir --- salt/common/packages.sls | 3 --- setup/so-functions | 5 ++++- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/salt/common/packages.sls b/salt/common/packages.sls index 0bb36d07f..006e33c3e 100644 --- a/salt/common/packages.sls +++ b/salt/common/packages.sls @@ -45,13 +45,10 @@ commonpkgs: - createrepo - python3-lxml - python3-packaging - - python3-watchdog - - yum-utils - device-mapper-persistent-data - lvm2 - openssl - git - - vim-enhanced - python3-docker {% else %} commonpkgs: diff --git a/setup/so-functions b/setup/so-functions index e71caa0a1..0b4ba9fa1 100755 --- a/setup/so-functions +++ b/setup/so-functions @@ -1965,7 +1965,9 @@ repo_sync_local() { # Make sure we can get to the sig repo logCmd "curl --retry 5 --retry-delay 60 -A 'gridinstall/$SOVERSION/$OS/$(uname -r)/1' https://sigs.securityonion.net/checkup --output /tmp/checkup" logCmd "dnf reposync --norepopath -n -g --delete -m -c /root/repodownload.conf --repoid=securityonionsync --download-metadata -p /nsm/repo/" - + # Run it again and make sure we got allt he things + logCmd "dnf reposync --norepopath -n -g --delete -m -c /root/repodownload.conf --repoid=securityonionsync --download-metadata -p /nsm/repo/" + # After the download is complete run createrepo create_repo @@ -2018,6 +2020,7 @@ saltify() { else # THIS IS A TEMP HACK logCmd "dnf -y install securityonion-salt" + logCmd "mkdir -p /etc/salt/minion.d" if [[ $waitforstate ]]; then # Since this is a salt master so let's install it logCmd "" From 8b680693f4a38313184088de1cc957fe7ba48972 Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Fri, 17 Feb 2023 11:01:17 -0500 Subject: [PATCH 12/83] remove patch pkg and patching of influx --- salt/common/tools/sbin/soup | 9 ----- salt/influxdb/init.sls | 3 -- salt/salt/helper-packages.sls | 3 -- salt/salt/minion.sls | 21 ---------- salt/salt/python3-influxdb.sls | 70 ---------------------------------- setup/so-functions | 4 -- setup/so-setup | 1 - 7 files changed, 111 deletions(-) delete mode 100644 salt/salt/helper-packages.sls delete mode 100644 salt/salt/python3-influxdb.sls diff --git a/salt/common/tools/sbin/soup b/salt/common/tools/sbin/soup index 6bdd49661..1ee166657 100755 --- a/salt/common/tools/sbin/soup +++ b/salt/common/tools/sbin/soup @@ -1026,8 +1026,6 @@ upgrade_salt() { else echo "Salt upgrade success." echo "" - echo "Removing /opt/so/state files for patched Salt InfluxDB module and state. This is due to Salt being upgraded and needing to patch the files again." - rm -vrf /opt/so/state/influxdb_continuous_query.py.patched /opt/so/state/influxdb_retention_policy.py.patched /opt/so/state/influxdbmod.py.patched fi } @@ -1138,9 +1136,7 @@ fix_wazuh() { # Update the repo files so it can actually upgrade upgrade_salt fi - rm -f /opt/so/state/influxdb_continuous_query.py.patched /opt/so/state/influxdbmod.py.patched /opt/so/state/influxdb_retention_policy.py.patched systemctl_func "start" "salt-master" - salt-call state.apply salt.python3-influxdb -l info systemctl_func "start" "salt-minion" systemctl_func "start" "$cron_service_name" @@ -1309,11 +1305,6 @@ main() { salt-call state.show_top -l error queue=True || fail "salt-master could not be reached. Check $SOUP_LOG for details." set -e - echo "" - echo "Ensuring python modules for Salt are installed and patched." - salt-call state.apply salt.python3-influxdb -l info queue=True - echo "" - # update the salt-minion configs here and start the minion # since highstate are disabled above, minion start should not trigger a highstate echo "" diff --git a/salt/influxdb/init.sls b/salt/influxdb/init.sls index 4fe625209..6baabd047 100644 --- a/salt/influxdb/init.sls +++ b/salt/influxdb/init.sls @@ -14,7 +14,6 @@ include: - salt.minion - - salt.python3-influxdb - ssl # Influx DB @@ -111,7 +110,6 @@ telegraf_database: - influxdb_host: {{ GLOBALS.manager }} - require: - docker_container: so-influxdb - - sls: salt.python3-influxdb - http: wait_for_influxdb {% for rp in influxdb.retention_policies.keys() %} @@ -131,7 +129,6 @@ telegraf_database: - docker_container: so-influxdb - influxdb_database: telegraf_database - file: influxdb_retention_policy.present_patch - - sls: salt.python3-influxdb {% endfor %} {% for dest_rp in influxdb.downsample.keys() %} diff --git a/salt/salt/helper-packages.sls b/salt/salt/helper-packages.sls deleted file mode 100644 index 32480c163..000000000 --- a/salt/salt/helper-packages.sls +++ /dev/null @@ -1,3 +0,0 @@ -patch_package: - pkg.installed: - - name: patch diff --git a/salt/salt/minion.sls b/salt/salt/minion.sls index 50bb865df..5e06a361f 100644 --- a/salt/salt/minion.sls +++ b/salt/salt/minion.sls @@ -10,7 +10,6 @@ include: - salt - - salt.helper-packages - systemd.reload - repo.client @@ -34,21 +33,6 @@ install_salt_minion: exec 2>&- # close stderr nohup /bin/sh -c '{{ UPGRADECOMMAND }}' & - {# if we are the salt master #} - {% if grains.id.split('_')|first == grains.master %} -remove_influxdb_continuous_query_state_file: - file.absent: - - name: /opt/so/state/influxdb_continuous_query.py.patched - -remove_influxdbmod_state_file: - file.absent: - - name: /opt/so/state/influxdbmod.py.patched - -remove_influxdb_retention_policy_state_file: - file.absent: - - name: /opt/so/state/influxdb_retention_policy.py.patched - {% endif %} - {% endif %} {% if INSTALLEDSALTVERSION|string == SALTVERSION|string %} @@ -115,8 +99,3 @@ salt_minion_service: - file: salt_minion_service_unit_file {% endif %} - order: last - - -patch_pkg: - pkg.installed: - - name: patch diff --git a/salt/salt/python3-influxdb.sls b/salt/salt/python3-influxdb.sls deleted file mode 100644 index 7a59c4303..000000000 --- a/salt/salt/python3-influxdb.sls +++ /dev/null @@ -1,70 +0,0 @@ -{% from "salt/map.jinja" import SALT_STATE_CODE_PATH with context %} -{% from "salt/map.jinja" import SALT_MODULE_CODE_PATH with context %} -{% from "salt/map.jinja" import PYTHON3INFLUX with context %} -{% from "salt/map.jinja" import PYTHON3INFLUXDEPS with context %} -{% from "salt/map.jinja" import PYTHONINSTALLER with context %} - -include: - - salt.helper-packages - -python3_influxdb_dependencies: - {{PYTHONINSTALLER}}.installed: - - pkgs: {{ PYTHON3INFLUXDEPS }} - -python3_influxdb: - {{PYTHONINSTALLER}}.installed: - - name: {{ PYTHON3INFLUX }} - -# We circumvent the file.patch state putting ERROR in the log by using the unless and file.touch below -# https://github.com/saltstack/salt/pull/47010 and https://github.com/saltstack/salt/issues/52329 - -#https://github.com/saltstack/salt/issues/59766 -influxdb_continuous_query.present_patch: - file.patch: - - name: {{ SALT_STATE_CODE_PATH }}/influxdb_continuous_query.py - - source: salt://salt/files/influxdb_continuous_query.py.patch - - require: - - {{PYTHONINSTALLER}}: python3_influxdb - - pkg: patch_package - - unless: ls /opt/so/state/influxdb_continuous_query.py.patched - -influxdb_continuous_query.py.patched: - file.touch: - - name: /opt/so/state/influxdb_continuous_query.py.patched - - onchanges: - - file: influxdb_continuous_query.present_patch - -#https://github.com/saltstack/salt/issues/59761 -influxdb_retention_policy.present_patch: - file.patch: - - name: {{ SALT_STATE_CODE_PATH }}/influxdb_retention_policy.py - - source: salt://salt/files/influxdb_retention_policy.py.patch - - require: - - {{PYTHONINSTALLER}}: python3_influxdb - - pkg: patch_package - - unless: ls /opt/so/state/influxdb_retention_policy.py.patched - -influxdb_retention_policy.py.patched: - file.touch: - - name: /opt/so/state/influxdb_retention_policy.py.patched - - onchanges: - - file: influxdb_retention_policy.present_patch - -# We should be able to set reload_modules: True in this state in order to tell salt to reload its python modules due to us possibly installing -# and possibly modifying modules in this state. This is bugged according to https://github.com/saltstack/salt/issues/24925 -influxdbmod.py_shard_duration_patch: - file.patch: - - name: {{ SALT_MODULE_CODE_PATH }}/influxdbmod.py - - source: salt://salt/files/influxdbmod.py.patch - - require: - - {{PYTHONINSTALLER}}: python3_influxdb - - pkg: patch_package - - unless: ls /opt/so/state/influxdbmod.py.patched - -influxdbmod.py.patched: - file.touch: - - name: /opt/so/state/influxdbmod.py.patched - - onchanges: - - file: influxdbmod.py_shard_duration_patch - - diff --git a/setup/so-functions b/setup/so-functions index 0b4ba9fa1..a0ee4c0d5 100755 --- a/setup/so-functions +++ b/setup/so-functions @@ -1795,10 +1795,6 @@ reinstall_init() { # Backup /opt/so since we'll be rebuilding this directory during setup backup_dir /opt/so "$date_string" - # We need to restore these files during a reinstall so python3-influxdb state doesn't try to patch again - restore_file "/opt/so_old_$date_string/state/influxdb_continuous_query.py.patched" "/opt/so/state/" - restore_file "/opt/so_old_$date_string/state/influxdb_retention_policy.py.patched" "/opt/so/state/" - restore_file "/opt/so_old_$date_string/state/influxdbmod.py.patched" "/opt/so/state/" # If the elastic license has been accepted restore the state file restore_file "/opt/so_old_$date_string/state/yeselastic.txt" "/opt/so/state/" diff --git a/setup/so-setup b/setup/so-setup index 9ecbed08c..9448a4011 100755 --- a/setup/so-setup +++ b/setup/so-setup @@ -577,7 +577,6 @@ if ! [[ -f $install_opt_file ]]; then logCmd "salt-call state.show_top" logCmd "salt-key -ya $MINION_ID" - logCmd "salt-call state.apply salt.helper-packages" logCmd "salt-call state.apply common.packages" logCmd "salt-call state.apply common" logCmd "salt-call state.apply docker" From 54fc07b5b8f30d82edea6139f77456e1b6ddbeab Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Fri, 17 Feb 2023 11:07:44 -0500 Subject: [PATCH 13/83] yum-utils --- setup/so-functions | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/setup/so-functions b/setup/so-functions index a0ee4c0d5..84d61a63c 100755 --- a/setup/so-functions +++ b/setup/so-functions @@ -1949,11 +1949,11 @@ repo_sync_local() { echo "gpgcheck=1" >> /root/repodownload.conf echo "gpgkey=https://repo.securityonion.net/file/securityonion-repo/keys/securityonion.pub" >> /root/repodownload.conf - REPOSYNC=$(rpm -qa | grep createrepo | wc -l) + REPOSYNC=$(rpm -qa | grep yum-utils | wc -l) if [[ ! "$REPOSYNC" -gt 0 ]]; then # Install reposync - info "Installing createrepo" - logCmd "dnf -y install -c /root/repodownload.conf createrepo" + info "Installing yum-utils" + logCmd "dnf -y install -c /root/repodownload.conf yum-utils" else info "We have what we need to sync" fi From 0a7ad4d2117b9bd63ad43c98672f10ce97b09865 Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Fri, 17 Feb 2023 11:16:02 -0500 Subject: [PATCH 14/83] yum-utils --- salt/common/packages.sls | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/salt/common/packages.sls b/salt/common/packages.sls index 006e33c3e..a47cf5a42 100644 --- a/salt/common/packages.sls +++ b/salt/common/packages.sls @@ -42,7 +42,7 @@ commonpkgs: - mariadb-devel - python3-dnf-plugin-versionlock - nmap-ncat - - createrepo + - yum-utils - python3-lxml - python3-packaging - device-mapper-persistent-data From d8e85cbc28d7aee6d2b431caf3fffb8a2f33c9a7 Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Fri, 17 Feb 2023 11:20:16 -0500 Subject: [PATCH 15/83] change salt version --- salt/salt/master.defaults.yaml | 2 +- salt/salt/minion.defaults.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/salt/salt/master.defaults.yaml b/salt/salt/master.defaults.yaml index 3e3510c8c..b4d80c476 100644 --- a/salt/salt/master.defaults.yaml +++ b/salt/salt/master.defaults.yaml @@ -2,4 +2,4 @@ # When updating the salt version, also update the version in securityonion-builds/images/iso-task/Dockerfile and saltify function in so-functions salt: master: - version: 3004.2 + version: 3006.0+0na.61a7bd9 diff --git a/salt/salt/minion.defaults.yaml b/salt/salt/minion.defaults.yaml index e4ffe5fcb..4021d0e31 100644 --- a/salt/salt/minion.defaults.yaml +++ b/salt/salt/minion.defaults.yaml @@ -2,6 +2,6 @@ # When updating the salt version, also update the version in securityonion-builds/images/iso-task/Dockerfile and saltify function in so-functions salt: minion: - version: 3004.2 + version: 3006 check_threshold: 3600 # in seconds, threshold used for so-salt-minion-check. any value less than 600 seconds may cause a lot of salt-minion restarts since the job to touch the file occurs every 5-8 minutes by default service_start_delay: 30 # in seconds. From c6919a09da31eb1574876b8b02be30c3cf5c4c0f Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Fri, 17 Feb 2023 11:26:11 -0500 Subject: [PATCH 16/83] replace centos --- salt/_modules/needs_restarting.py | 2 +- salt/allowed_states.map.jinja | 2 +- salt/common/init.sls | 2 +- salt/common/tools/sbin/so-analyst-install | 10 +++++----- salt/mysql/init.sls | 2 +- salt/repo/client/map.jinja | 18 +++++++++--------- salt/salt/init.sls | 8 +------- salt/salt/map.jinja | 2 +- salt/ssl/init.sls | 2 +- salt/top.sls | 6 +++--- salt/workstation/packages.sls | 2 +- salt/workstation/remove_gui.sls | 2 +- salt/workstation/trusted-ca.sls | 2 +- salt/workstation/xwindows.sls | 2 +- setup/so-functions | 2 +- 15 files changed, 29 insertions(+), 35 deletions(-) diff --git a/salt/_modules/needs_restarting.py b/salt/_modules/needs_restarting.py index 5afb6f02a..8f5b50242 100644 --- a/salt/_modules/needs_restarting.py +++ b/salt/_modules/needs_restarting.py @@ -10,7 +10,7 @@ def check(): if path.exists('/var/run/reboot-required'): retval = 'True' - elif os == 'CentOS': + elif os == 'Rocky': cmd = 'needs-restarting -r > /dev/null 2>&1' try: diff --git a/salt/allowed_states.map.jinja b/salt/allowed_states.map.jinja index 823b7b647..38f790053 100644 --- a/salt/allowed_states.map.jinja +++ b/salt/allowed_states.map.jinja @@ -262,7 +262,7 @@ {% do allowed_states.append('redis') %} {% endif %} - {% if grains.os == 'CentOS' %} + {% if grains.os == 'Rocky' %} {% if not ISAIRGAP %} {% do allowed_states.append('yum') %} {% endif %} diff --git a/salt/common/init.sls b/salt/common/init.sls index ea943ce4b..21c4ce369 100644 --- a/salt/common/init.sls +++ b/salt/common/init.sls @@ -235,7 +235,7 @@ soversionfile: {% endif %} {% if GLOBALS.so_model %} - {% if GLOBALS.os == 'CentOS' %} + {% if GLOBALS.os == 'Rocky' %} # Install Raid tools raidpkgs: pkg.installed: diff --git a/salt/common/tools/sbin/so-analyst-install b/salt/common/tools/sbin/so-analyst-install index f4eef07fa..4949989b0 100755 --- a/salt/common/tools/sbin/so-analyst-install +++ b/salt/common/tools/sbin/so-analyst-install @@ -6,8 +6,8 @@ # Elastic License 2.0. -{# we only want the script to install the workstation if it is CentOS -#} -{% if grains.os == 'CentOS' -%} +{# we only want the script to install the workstation if it is Rocky -#} +{% if grains.os == 'Rocky' -%} {# if this is a manager -#} {% if grains.master == grains.id.split('_')|first -%} @@ -80,12 +80,12 @@ echo "Since this is not a manager, the pillar values to enable analyst workstati {#- endif if this is a manager #} {% endif -%} -{#- if not CentOS #} +{#- if not Rocky #} {%- else %} -echo "The Analyst Workstation can only be installed on CentOS. Please view the documentation at $doc_workstation_url." +echo "The Analyst Workstation can only be installed on Rocky. Please view the documentation at $doc_workstation_url." -{#- endif grains.os == CentOS #} +{#- endif grains.os == Rocky #} {% endif -%} exit 0 diff --git a/salt/mysql/init.sls b/salt/mysql/init.sls index b2c4a2119..7287eb00d 100644 --- a/salt/mysql/init.sls +++ b/salt/mysql/init.sls @@ -14,7 +14,7 @@ mysqlpkgs: pkg.installed: - skip_suggestions: False - pkgs: - {% if grains['os'] != 'CentOS' %} + {% if grains['os'] != 'Rocky' %} {% if grains['oscodename'] == 'bionic' %} - python3-mysqldb {% elif grains['oscodename'] == 'focal' %} diff --git a/salt/repo/client/map.jinja b/salt/repo/client/map.jinja index abf824aeb..1e5d9351f 100644 --- a/salt/repo/client/map.jinja +++ b/salt/repo/client/map.jinja @@ -1,16 +1,16 @@ {% from 'vars/globals.map.jinja' import GLOBALS %} -{% if GLOBALS.os == 'CentOS' %} +{% if GLOBALS.os == 'Rocky' %} {% set REPOPATH = '/etc/yum.repos.d/' %} {% set ABSENTFILES = [ - 'CentOS-Base.repo', - 'CentOS-CR.repo', - 'CentOS-Debuginfo.repo', - 'CentOS-fasttrack.repo', - 'CentOS-Media.repo', - 'CentOS-Sources.repo', - 'CentOS-Vault.repo', - 'CentOS-x86_64-kernel.repo', + 'Rocky-Base.repo', + 'Rocky-CR.repo', + 'Rocky-Debuginfo.repo', + 'Rocky-fasttrack.repo', + 'Rocky-Media.repo', + 'Rocky-Sources.repo', + 'Rocky-Vault.repo', + 'Rocky-x86_64-kernel.repo', 'docker-ce.repo', 'epel.repo', 'epel-testing.repo', diff --git a/salt/salt/init.sls b/salt/salt/init.sls index 7a553ac51..da66e100e 100644 --- a/salt/salt/init.sls +++ b/salt/salt/init.sls @@ -1,6 +1,6 @@ {% from 'vars/globals.map.jinja' import GLOBALS %} -{% if GLOBALS.os != 'CentOS' %} +{% if GLOBALS.os != 'Rocky' %} saltpymodules: pkg.installed: - pkgs: @@ -18,9 +18,3 @@ salt_bootstrap: - name: /usr/sbin/bootstrap-salt.sh - source: salt://salt/scripts/bootstrap-salt.sh - mode: 755 - -{% if GLOBALS.os == 'CentOS' %} -remove_salt-2019-2-5.repo: - file.absent: - - name: /etc/yum.repos.d/salt-2019-2-5.repo -{% endif %} diff --git a/salt/salt/map.jinja b/salt/salt/map.jinja index 389a95607..d9f206fed 100644 --- a/salt/salt/map.jinja +++ b/salt/salt/map.jinja @@ -28,7 +28,7 @@ {% set INSTALLEDSALTVERSION = salt['pkg.version']('salt-minion').split(SPLITCHAR)[0] %} {% if grains.saltversion|string != SALTVERSION|string %} - {% if grains.os|lower in ['centos', 'redhat'] %} + {% if grains.os|lower in ['Rocky', 'redhat'] %} {% set UPGRADECOMMAND = 'yum clean all ; /usr/sbin/bootstrap-salt.sh -s 120 -r -F -x python3 stable ' ~ SALTVERSION %} {% elif grains.os|lower == 'ubuntu' %} {% set UPGRADECOMMAND = '/usr/sbin/bootstrap-salt.sh -s 120 -r -F -x python3 stable ' ~ SALTVERSION %} diff --git a/salt/ssl/init.sls b/salt/ssl/init.sls index 855a4a3ea..c251a706a 100644 --- a/salt/ssl/init.sls +++ b/salt/ssl/init.sls @@ -41,7 +41,7 @@ trusttheca: - name: /etc/ssl/certs/intca.crt - text: {{ trusttheca_text }} -{% if grains['os'] != 'CentOS' %} +{% if grains['os'] != 'Rocky' %} # Install packages needed for the sensor m2cryptopkgs: pkg.installed: diff --git a/salt/top.sls b/salt/top.sls index 4b8531f4d..f0b60deb5 100644 --- a/salt/top.sls +++ b/salt/top.sls @@ -29,7 +29,7 @@ base: - salt.minion-state-apply-test - salt.minion - 'G@os:CentOS and G@saltversion:{{saltversion}}': + 'G@os:Rocky and G@saltversion:{{saltversion}}': - match: compound - yum.packages @@ -377,10 +377,10 @@ base: {%- endif %} - idh - 'J@workstation:gui:enabled:^[Tt][Rr][Uu][Ee]$ and ( G@saltversion:{{saltversion}} and G@os:CentOS )': + 'J@workstation:gui:enabled:^[Tt][Rr][Uu][Ee]$ and ( G@saltversion:{{saltversion}} and G@os:Rocky )': - match: compound - workstation - 'J@workstation:gui:enabled:^[Ff][Aa][Ll][Ss][Ee]$ and ( G@saltversion:{{saltversion}} and G@os:CentOS )': + 'J@workstation:gui:enabled:^[Ff][Aa][Ll][Ss][Ee]$ and ( G@saltversion:{{saltversion}} and G@os:Rocky )': - match: compound - workstation.remove_gui diff --git a/salt/workstation/packages.sls b/salt/workstation/packages.sls index b63762a2c..6b9b9c689 100644 --- a/salt/workstation/packages.sls +++ b/salt/workstation/packages.sls @@ -1,7 +1,7 @@ {% from 'vars/globals.map.jinja' import GLOBALS %} {# we only want this state to run it is CentOS #} -{% if GLOBALS.os == 'CentOS' %} +{% if GLOBALS.os == 'Rocky' %} xwindows_group: pkg.group_installed: diff --git a/salt/workstation/remove_gui.sls b/salt/workstation/remove_gui.sls index 0eefc9462..363b8c433 100644 --- a/salt/workstation/remove_gui.sls +++ b/salt/workstation/remove_gui.sls @@ -1,7 +1,7 @@ {% from 'vars/globals.map.jinja' import GLOBALS %} {# we only want this state to run it is CentOS #} -{% if GLOBALS.os == 'CentOS' %} +{% if GLOBALS.os == 'Rocky' %} remove_graphical_target: file.symlink: diff --git a/salt/workstation/trusted-ca.sls b/salt/workstation/trusted-ca.sls index fcdf7cffc..a8d48c046 100644 --- a/salt/workstation/trusted-ca.sls +++ b/salt/workstation/trusted-ca.sls @@ -1,7 +1,7 @@ {% from 'vars/globals.map.jinja' import GLOBALS %} {# we only want this state to run it is CentOS #} -{% if GLOBALS.os == 'CentOS' %} +{% if GLOBALS.os == 'Rocky' %} {% set global_ca_text = [] %} {% set global_ca_server = [] %} diff --git a/salt/workstation/xwindows.sls b/salt/workstation/xwindows.sls index bcd543868..d8fb53976 100644 --- a/salt/workstation/xwindows.sls +++ b/salt/workstation/xwindows.sls @@ -1,7 +1,7 @@ {% from 'vars/globals.map.jinja' import GLOBALS %} {# we only want this state to run it is CentOS #} -{% if GLOBALS.os == 'CentOS' %} +{% if GLOBALS.os == 'Rocky' %} include: - workstation.packages diff --git a/setup/so-functions b/setup/so-functions index 84d61a63c..085621acd 100755 --- a/setup/so-functions +++ b/setup/so-functions @@ -2150,7 +2150,7 @@ set_proxy() { "}" > /root/.docker/config.json # Set proxy for package manager - if [[ $is_centos ]]; then + if [[ $is_rocky ]]; then echo "proxy=$so_proxy" >> /etc/yum.conf else # Set it up so the updates roll through the manager From 43c177727cb18421a2714382a33451814a243438 Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Fri, 17 Feb 2023 11:32:05 -0500 Subject: [PATCH 17/83] replace centos --- salt/common/packages.sls | 35 ----------------------------------- 1 file changed, 35 deletions(-) diff --git a/salt/common/packages.sls b/salt/common/packages.sls index a47cf5a42..2bf13692d 100644 --- a/salt/common/packages.sls +++ b/salt/common/packages.sls @@ -43,44 +43,9 @@ commonpkgs: - python3-dnf-plugin-versionlock - nmap-ncat - yum-utils - - python3-lxml - - python3-packaging - device-mapper-persistent-data - lvm2 - openssl - git - python3-docker -{% else %} -commonpkgs: - pkg.installed: - - skip_suggestions: True - - pkgs: - - wget - - ntpdate - - bind-utils - - jq - - tcpdump - - httpd-tools - - net-tools - - curl - - sqlite - - mariadb-devel - - nmap-ncat - - python3 - - python36-packaging - - python36-lxml - - python36-docker - - python36-dateutil - - python36-m2crypto - - python36-mysql - - python36-packaging - - python36-lxml - - securityonion-python36-watchdog - - yum-utils - - device-mapper-persistent-data - - lvm2 - - openssl - - git - - vim-enhanced - - yum-plugin-versionlock {% endif %} From ba9c52db377c449d70828ae1c0c866124364eeaa Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Fri, 17 Feb 2023 11:37:28 -0500 Subject: [PATCH 18/83] replace centos --- salt/common/packages.sls | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/salt/common/packages.sls b/salt/common/packages.sls index 2bf13692d..72f665149 100644 --- a/salt/common/packages.sls +++ b/salt/common/packages.sls @@ -47,5 +47,16 @@ commonpkgs: - lvm2 - openssl - git +rockypythonpacks: + pkg.installed: + - skip_suggestions: True + - pkgs: - python3-docker + -pkg_verify: + - ignore_types: + - config + - doc + - verify_options: + - nodeps + - nofiledigest {% endif %} From e7f35673e0d10cbb9047435399047ab72234fbe0 Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Fri, 17 Feb 2023 11:38:50 -0500 Subject: [PATCH 19/83] replace centos --- salt/common/packages.sls | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/salt/common/packages.sls b/salt/common/packages.sls index 72f665149..dabf59eef 100644 --- a/salt/common/packages.sls +++ b/salt/common/packages.sls @@ -52,7 +52,7 @@ rockypythonpacks: - skip_suggestions: True - pkgs: - python3-docker - -pkg_verify: + - pkg_verify: - ignore_types: - config - doc From 4bb49ad617d0d823c3ce55c58f924ffc1b644fac Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Fri, 17 Feb 2023 13:11:13 -0500 Subject: [PATCH 20/83] add some deps --- setup/so-functions | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/setup/so-functions b/setup/so-functions index 085621acd..ba00ea5b7 100755 --- a/setup/so-functions +++ b/setup/so-functions @@ -2009,21 +2009,15 @@ saltify() { fi if [[ $is_rocky ]]; then - RUSALTY=$(rpm -qa | grep salt-minion | wc -l) - if [[ "$RUSALTY" -gt 0 ]]; then - # Salt is already installed. - info "salt is installed" + # THIS IS A TEMP HACK + logCmd "dnf -y install securityonion-salt python3-chardet python3-idna python3-pysocks python3-requests python3-urllib3 python3-websocket-client python36-docker" + logCmd "mkdir -p /etc/salt/minion.d" + if [[ $waitforstate ]]; then + # Since this is a salt master so let's install it + logCmd "" else - # THIS IS A TEMP HACK - logCmd "dnf -y install securityonion-salt" - logCmd "mkdir -p /etc/salt/minion.d" - if [[ $waitforstate ]]; then - # Since this is a salt master so let's install it - logCmd "" - else - # We just need the minion - logCmd "dnf -y install salt-minion" - fi + # We just need the minion + logCmd "dnf -y install salt-minion" fi fi From e3e8d301615674e1d42b5b1cde882a5ec13038d8 Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Fri, 17 Feb 2023 13:17:57 -0500 Subject: [PATCH 21/83] fix python docker name --- setup/so-functions | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/setup/so-functions b/setup/so-functions index ba00ea5b7..b25561729 100755 --- a/setup/so-functions +++ b/setup/so-functions @@ -877,6 +877,7 @@ create_manager_pillars() { create_repo() { title "Create the repo directory" + logCmd "dnf -y install yum-utils" logCmd "createrepo /nsm/repo" } @@ -1949,14 +1950,6 @@ repo_sync_local() { echo "gpgcheck=1" >> /root/repodownload.conf echo "gpgkey=https://repo.securityonion.net/file/securityonion-repo/keys/securityonion.pub" >> /root/repodownload.conf - REPOSYNC=$(rpm -qa | grep yum-utils | wc -l) - if [[ ! "$REPOSYNC" -gt 0 ]]; then - # Install reposync - info "Installing yum-utils" - logCmd "dnf -y install -c /root/repodownload.conf yum-utils" - else - info "We have what we need to sync" - fi dnf repolist # Make sure we can get to the sig repo logCmd "curl --retry 5 --retry-delay 60 -A 'gridinstall/$SOVERSION/$OS/$(uname -r)/1' https://sigs.securityonion.net/checkup --output /tmp/checkup" @@ -1964,7 +1957,6 @@ repo_sync_local() { # Run it again and make sure we got allt he things logCmd "dnf reposync --norepopath -n -g --delete -m -c /root/repodownload.conf --repoid=securityonionsync --download-metadata -p /nsm/repo/" - # After the download is complete run createrepo create_repo @@ -2010,7 +2002,7 @@ saltify() { if [[ $is_rocky ]]; then # THIS IS A TEMP HACK - logCmd "dnf -y install securityonion-salt python3-chardet python3-idna python3-pysocks python3-requests python3-urllib3 python3-websocket-client python36-docker" + logCmd "dnf -y install securityonion-salt python3-chardet python3-idna python3-pysocks python3-requests python3-urllib3 python3-websocket-client python3-docker" logCmd "mkdir -p /etc/salt/minion.d" if [[ $waitforstate ]]; then # Since this is a salt master so let's install it From ba5b125952f42e59bc1914b58ae8a618d694e608 Mon Sep 17 00:00:00 2001 From: Josh Patterson Date: Fri, 17 Feb 2023 13:25:01 -0500 Subject: [PATCH 22/83] Update minion.defaults.yaml --- salt/salt/minion.defaults.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/salt/salt/minion.defaults.yaml b/salt/salt/minion.defaults.yaml index 4021d0e31..7bbd569c6 100644 --- a/salt/salt/minion.defaults.yaml +++ b/salt/salt/minion.defaults.yaml @@ -2,6 +2,6 @@ # When updating the salt version, also update the version in securityonion-builds/images/iso-task/Dockerfile and saltify function in so-functions salt: minion: - version: 3006 + version: 3006.0+0na.61a7bd9 check_threshold: 3600 # in seconds, threshold used for so-salt-minion-check. any value less than 600 seconds may cause a lot of salt-minion restarts since the job to touch the file occurs every 5-8 minutes by default service_start_delay: 30 # in seconds. From 12398bdf24017b349135fa8f22527496eb79bb95 Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Fri, 17 Feb 2023 13:34:21 -0500 Subject: [PATCH 23/83] add m2crypto --- salt/ssl/init.sls | 6 ------ 1 file changed, 6 deletions(-) diff --git a/salt/ssl/init.sls b/salt/ssl/init.sls index c251a706a..bf31fff27 100644 --- a/salt/ssl/init.sls +++ b/salt/ssl/init.sls @@ -41,18 +41,12 @@ trusttheca: - name: /etc/ssl/certs/intca.crt - text: {{ trusttheca_text }} -{% if grains['os'] != 'Rocky' %} # Install packages needed for the sensor m2cryptopkgs: pkg.installed: - skip_suggestions: False - pkgs: - {% if grains['oscodename'] == 'bionic' %} - - python-m2crypto - {% elif grains['oscodename'] == 'focal' %} - python3-m2crypto - {% endif %} -{% endif %} influxdb_key: x509.private_key_managed: From bcf1fe8dadaafd6f235c3d922c48a0a2f544c831 Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Fri, 17 Feb 2023 13:48:10 -0500 Subject: [PATCH 24/83] fix reposync script --- salt/common/tools/sbin/so-repo-sync | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/salt/common/tools/sbin/so-repo-sync b/salt/common/tools/sbin/so-repo-sync index 67adb46ff..4a9cc3b18 100644 --- a/salt/common/tools/sbin/so-repo-sync +++ b/salt/common/tools/sbin/so-repo-sync @@ -12,5 +12,5 @@ set_os salt_minion_count curl --retry 5 --retry-delay 60 -A 'checkin/$VERSION/$OS/$(uname -r)/$MINIONCOUNT' https://sigs.securityonion.net/checkup --output /tmp/checkup" -reposync --norepopath -n -g -l -d -m -c /root/repodownload.conf -r securityonionsync --download-metadata -p /nsm/repo/" - \ No newline at end of file +reposync --norepopath -n -g -l -d -m -c /root/repodownload.conf -r securityonionsync --download-metadata -p /nsm/repo/ +crete_repo /nsm/repo \ No newline at end of file From c6cbb4857d6d1df70bf73ffc3dd3e4d89243a4f0 Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Fri, 17 Feb 2023 13:53:36 -0500 Subject: [PATCH 25/83] add rsync --- salt/common/packages.sls | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/salt/common/packages.sls b/salt/common/packages.sls index dabf59eef..5bbf3b9f6 100644 --- a/salt/common/packages.sls +++ b/salt/common/packages.sls @@ -47,16 +47,6 @@ commonpkgs: - lvm2 - openssl - git -rockypythonpacks: - pkg.installed: - - skip_suggestions: True - - pkgs: - python3-docker - - pkg_verify: - - ignore_types: - - config - - doc - - verify_options: - - nodeps - - nofiledigest + - rsync {% endif %} From c6266e9f91ab32ffcfa71867cf6bf594ec3ad9e5 Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Fri, 17 Feb 2023 13:54:46 -0500 Subject: [PATCH 26/83] add m2crypto --- salt/common/packages.sls | 1 + 1 file changed, 1 insertion(+) diff --git a/salt/common/packages.sls b/salt/common/packages.sls index 5bbf3b9f6..9fd9f4e51 100644 --- a/salt/common/packages.sls +++ b/salt/common/packages.sls @@ -48,5 +48,6 @@ commonpkgs: - openssl - git - python3-docker + - python3-m2crypto - rsync {% endif %} From b53aa08eeb279775d9d9badc6a9237be22ff6c4e Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Fri, 17 Feb 2023 13:58:45 -0500 Subject: [PATCH 27/83] remove grafana and filebeat --- salt/filebeat/defaults.yaml | 112 - salt/filebeat/etc/filebeat.yml | 674 ---- salt/filebeat/etc/module-setup.yml | 10 - salt/filebeat/etc/module_config.yml.jinja | 2 - salt/filebeat/init.sls | 162 - salt/filebeat/map.jinja | 15 - salt/filebeat/modules.map.jinja | 18 - salt/filebeat/pillar.example | 22 - salt/filebeat/securityoniondefaults.yaml | 30 - salt/filebeat/thirdpartydefaults.yaml | 261 -- .../dashboards/common_template.json.jinja | 64 - salt/grafana/etc/dashboards/dashboard.yml | 12 - salt/grafana/etc/datasources/influxdb.yaml | 17 - salt/grafana/etc/files/readme.txt | 1 - salt/grafana/etc/grafana.ini.jinja | 12 - salt/grafana/grafana_defaults.yaml | 3147 ----------------- salt/grafana/init.sls | 164 - ...u_docker_combined_current_graph.json.jinja | 223 -- ...cpu_docker_combined_trend_graph.json.jinja | 220 -- .../panels/cpu_usage_current_graph.json.jinja | 150 - .../grafana/panels/cpu_usage_guage.json.jinja | 126 - .../cpu_usage_tasks_all_graph.json.jinja | 193 - .../cpu_usage_tasks_blocked_graph.json.jinja | 124 - .../cpu_usage_tasks_paging_graph.json.jinja | 124 - .../cpu_usage_tasks_running_graph.json.jinja | 124 - .../cpu_usage_tasks_sleeping_graph.json.jinja | 124 - .../cpu_usage_tasks_stopped_graph.json.jinja | 124 - .../cpu_usage_tasks_unknown_graph.json.jinja | 124 - .../cpu_usage_tasks_zombies_graph.json.jinja | 124 - .../panels/disk_io_bytes_graph.json.jinja | 189 - .../panels/disk_io_requests_graph.json.jinja | 190 - .../panels/disk_io_time_graph.json.jinja | 189 - .../panels/disk_usage_nsm_graph.json.jinja | 211 -- .../disk_usage_nsm_percent_graph.json.jinja | 149 - .../panels/disk_usage_root_graph.json.jinja | 211 -- .../disk_usage_root_percent_graph.json.jinja | 149 - ...sticsearch_document_count_graph.json.jinja | 193 - ...rch_field_data_cache_size_graph.json.jinja | 191 - ..._ingest_performance_nontc_graph.json.jinja | 796 ----- ...rch_ingest_performance_tc_graph.json.jinja | 793 ----- ...earch_pipeline_time_nontc_graph.json.jinja | 153 - ...icsearch_pipeline_time_tc_graph.json.jinja | 129 - .../elasticsearch_store_size_graph.json.jinja | 195 - ...lasticsearch_thread_count_graph.json.jinja | 192 - .../panels/influxdb_db_size_graph.json.jinja | 191 - salt/grafana/panels/io_wait_graph.json.jinja | 148 - salt/grafana/panels/io_wait_stat.json.jinja | 125 - .../load_average_5_minute_stat.json.jinja | 118 - .../panels/load_averages_graph.json.jinja | 187 - ...gstash_eps_in_out_manager_graph.json.jinja | 403 --- ...logstash_estimated_eps_in_graph.json.jinja | 230 -- .../logstash_estimated_eps_in_stat.json.jinja | 136 - ...sh_estimated_eps_in_total_graph.json.jinja | 156 - ...ogstash_estimated_eps_out_graph.json.jinja | 230 -- ...logstash_estimated_eps_out_stat.json.jinja | 136 - ...h_estimated_eps_out_total_graph.json.jinja | 156 - ...ing_eps_in_out_searchnode_graph.json.jinja | 411 --- ...g_eps_in_searchnode_total_graph.json.jinja | 170 - ...anagement_interface_drops_graph.json.jinja | 282 -- ...t_interface_drops_inbound_graph.json.jinja | 142 - ..._interface_drops_outbound_graph.json.jinja | 142 - ...agement_interface_packets_graph.json.jinja | 283 -- ...nt_interface_traffic_both_graph.json.jinja | 409 --- ...interface_traffic_inbound_graph.json.jinja | 164 - ...nterface_traffic_outbound_graph.json.jinja | 162 - .../panels/memory_usage_graph.json.jinja | 208 -- .../memory_usage_percent_graph.json.jinja | 139 - ...d_docker_combined_current_graph.json.jinja | 143 - ...sed_docker_combined_trend_graph.json.jinja | 143 - .../monitor_interface_drops_graph.json.jinja | 282 -- ...r_interface_drops_inbound_graph.json.jinja | 125 - ...monitor_interface_packets_graph.json.jinja | 282 -- ...or_interface_traffic_both_graph.json.jinja | 276 -- ...interface_traffic_inbound_graph.json.jinja | 167 - ...ace_traffic_inbound_total_graph.json.jinja | 178 - .../monitor_interface_traffic_stat.json.jinja | 152 - ...e_docker_combined_current_graph.json.jinja | 232 -- ...age_docker_combined_trend_graph.json.jinja | 231 -- salt/grafana/panels/nsm_used_guage.json.jinja | 121 - .../panels/pcap_retention_stat.json.jinja | 113 - .../panels/process_status_graph.json.jinja | 203 -- .../grafana/panels/ram_usage_guage.json.jinja | 114 - .../panels/redis_queue_graph.json.jinja | 208 -- .../panels/redis_queue_stat.json.jinja | 95 - .../panels/rootfs_used_guage.json.jinja | 121 - salt/grafana/panels/row_cpu.json.jinja | 15 - salt/grafana/panels/row_disk_iops.json.jinja | 22 - salt/grafana/panels/row_disk_usage.json.jinja | 15 - .../panels/row_docker_details.json.jinja | 15 - .../panels/row_elasticsearch.json.jinja | 15 - salt/grafana/panels/row_influxdb.json.jinja | 15 - salt/grafana/panels/row_logstash.json.jinja | 15 - salt/grafana/panels/row_memory.json.jinja | 15 - salt/grafana/panels/row_network.json.jinja | 15 - salt/grafana/panels/row_overview.json.jinja | 15 - .../grafana/panels/row_packet_loss.json.jinja | 15 - salt/grafana/panels/row_redis.json.jinja | 15 - .../panels/row_stenographer.json.jinja | 15 - salt/grafana/panels/row_suricata.json.jinja | 15 - salt/grafana/panels/row_swap.json.jinja | 15 - salt/grafana/panels/row_zeek.json.jinja | 15 - .../stenographer_packet_loss_graph.json.jinja | 229 -- .../stenographer_packet_loss_stat.json.jinja | 114 - ...enographer_pcap_retention_graph.json.jinja | 207 -- .../suricata_packet_loss_graph.json.jinja | 241 -- .../suricata_packet_loss_stat.json.jinja | 120 - .../panels/swap_io_bytes_graph.json.jinja | 187 - .../panels/swap_usage_bytes_graph.json.jinja | 184 - .../panels/swap_usage_guage.json.jinja | 115 - .../swap_usage_percent_graph.json.jinja | 141 - salt/grafana/panels/system_uptime.json.jinja | 91 - .../panels/system_uptime_graph.json.jinja | 148 - ...e_docker_combined_current_graph.json.jinja | 168 - ...ime_docker_combined_trend_graph.json.jinja | 165 - .../panels/zeek_capture_loss_graph.json.jinja | 203 -- .../panels/zeek_packet_loss_graph.json.jinja | 244 -- .../panels/zeek_packet_loss_stat.json.jinja | 120 - .../zeek_restarts_healthcheck_stat.json.jinja | 93 - salt/grafana/soc_grafana.yaml | 49 - salt/grafana/templates/cluster_name.json | 25 - salt/grafana/templates/containers.json | 29 - salt/grafana/templates/cpucount.json | 24 - salt/grafana/templates/disk.json | 39 - salt/grafana/templates/manint.json | 29 - salt/grafana/templates/monint.json | 29 - salt/grafana/templates/role.json | 29 - salt/grafana/templates/searchnode.json | 25 - salt/grafana/templates/servername.json | 34 - 128 files changed, 21676 deletions(-) delete mode 100644 salt/filebeat/defaults.yaml delete mode 100644 salt/filebeat/etc/filebeat.yml delete mode 100644 salt/filebeat/etc/module-setup.yml delete mode 100644 salt/filebeat/etc/module_config.yml.jinja delete mode 100644 salt/filebeat/init.sls delete mode 100644 salt/filebeat/map.jinja delete mode 100644 salt/filebeat/modules.map.jinja delete mode 100644 salt/filebeat/pillar.example delete mode 100644 salt/filebeat/securityoniondefaults.yaml delete mode 100644 salt/filebeat/thirdpartydefaults.yaml delete mode 100644 salt/grafana/dashboards/common_template.json.jinja delete mode 100644 salt/grafana/etc/dashboards/dashboard.yml delete mode 100644 salt/grafana/etc/datasources/influxdb.yaml delete mode 100644 salt/grafana/etc/files/readme.txt delete mode 100644 salt/grafana/etc/grafana.ini.jinja delete mode 100644 salt/grafana/grafana_defaults.yaml delete mode 100644 salt/grafana/init.sls delete mode 100644 salt/grafana/panels/cpu_docker_combined_current_graph.json.jinja delete mode 100644 salt/grafana/panels/cpu_docker_combined_trend_graph.json.jinja delete mode 100644 salt/grafana/panels/cpu_usage_current_graph.json.jinja delete mode 100644 salt/grafana/panels/cpu_usage_guage.json.jinja delete mode 100644 salt/grafana/panels/cpu_usage_tasks_all_graph.json.jinja delete mode 100644 salt/grafana/panels/cpu_usage_tasks_blocked_graph.json.jinja delete mode 100644 salt/grafana/panels/cpu_usage_tasks_paging_graph.json.jinja delete mode 100644 salt/grafana/panels/cpu_usage_tasks_running_graph.json.jinja delete mode 100644 salt/grafana/panels/cpu_usage_tasks_sleeping_graph.json.jinja delete mode 100644 salt/grafana/panels/cpu_usage_tasks_stopped_graph.json.jinja delete mode 100644 salt/grafana/panels/cpu_usage_tasks_unknown_graph.json.jinja delete mode 100644 salt/grafana/panels/cpu_usage_tasks_zombies_graph.json.jinja delete mode 100644 salt/grafana/panels/disk_io_bytes_graph.json.jinja delete mode 100644 salt/grafana/panels/disk_io_requests_graph.json.jinja delete mode 100644 salt/grafana/panels/disk_io_time_graph.json.jinja delete mode 100644 salt/grafana/panels/disk_usage_nsm_graph.json.jinja delete mode 100644 salt/grafana/panels/disk_usage_nsm_percent_graph.json.jinja delete mode 100644 salt/grafana/panels/disk_usage_root_graph.json.jinja delete mode 100644 salt/grafana/panels/disk_usage_root_percent_graph.json.jinja delete mode 100644 salt/grafana/panels/elasticsearch_document_count_graph.json.jinja delete mode 100644 salt/grafana/panels/elasticsearch_field_data_cache_size_graph.json.jinja delete mode 100644 salt/grafana/panels/elasticsearch_ingest_performance_nontc_graph.json.jinja delete mode 100644 salt/grafana/panels/elasticsearch_ingest_performance_tc_graph.json.jinja delete mode 100644 salt/grafana/panels/elasticsearch_pipeline_time_nontc_graph.json.jinja delete mode 100644 salt/grafana/panels/elasticsearch_pipeline_time_tc_graph.json.jinja delete mode 100644 salt/grafana/panels/elasticsearch_store_size_graph.json.jinja delete mode 100644 salt/grafana/panels/elasticsearch_thread_count_graph.json.jinja delete mode 100644 salt/grafana/panels/influxdb_db_size_graph.json.jinja delete mode 100644 salt/grafana/panels/io_wait_graph.json.jinja delete mode 100644 salt/grafana/panels/io_wait_stat.json.jinja delete mode 100644 salt/grafana/panels/load_average_5_minute_stat.json.jinja delete mode 100644 salt/grafana/panels/load_averages_graph.json.jinja delete mode 100644 salt/grafana/panels/logstash_eps_in_out_manager_graph.json.jinja delete mode 100644 salt/grafana/panels/logstash_estimated_eps_in_graph.json.jinja delete mode 100644 salt/grafana/panels/logstash_estimated_eps_in_stat.json.jinja delete mode 100644 salt/grafana/panels/logstash_estimated_eps_in_total_graph.json.jinja delete mode 100644 salt/grafana/panels/logstash_estimated_eps_out_graph.json.jinja delete mode 100644 salt/grafana/panels/logstash_estimated_eps_out_stat.json.jinja delete mode 100644 salt/grafana/panels/logstash_estimated_eps_out_total_graph.json.jinja delete mode 100644 salt/grafana/panels/logstash_indexing_eps_in_out_searchnode_graph.json.jinja delete mode 100644 salt/grafana/panels/logstash_indexing_eps_in_searchnode_total_graph.json.jinja delete mode 100644 salt/grafana/panels/management_interface_drops_graph.json.jinja delete mode 100644 salt/grafana/panels/management_interface_drops_inbound_graph.json.jinja delete mode 100644 salt/grafana/panels/management_interface_drops_outbound_graph.json.jinja delete mode 100644 salt/grafana/panels/management_interface_packets_graph.json.jinja delete mode 100644 salt/grafana/panels/management_interface_traffic_both_graph.json.jinja delete mode 100644 salt/grafana/panels/management_interface_traffic_inbound_graph.json.jinja delete mode 100644 salt/grafana/panels/management_interface_traffic_outbound_graph.json.jinja delete mode 100644 salt/grafana/panels/memory_usage_graph.json.jinja delete mode 100644 salt/grafana/panels/memory_usage_percent_graph.json.jinja delete mode 100644 salt/grafana/panels/memory_used_docker_combined_current_graph.json.jinja delete mode 100644 salt/grafana/panels/memory_used_docker_combined_trend_graph.json.jinja delete mode 100644 salt/grafana/panels/monitor_interface_drops_graph.json.jinja delete mode 100644 salt/grafana/panels/monitor_interface_drops_inbound_graph.json.jinja delete mode 100644 salt/grafana/panels/monitor_interface_packets_graph.json.jinja delete mode 100644 salt/grafana/panels/monitor_interface_traffic_both_graph.json.jinja delete mode 100644 salt/grafana/panels/monitor_interface_traffic_inbound_graph.json.jinja delete mode 100644 salt/grafana/panels/monitor_interface_traffic_inbound_total_graph.json.jinja delete mode 100644 salt/grafana/panels/monitor_interface_traffic_stat.json.jinja delete mode 100644 salt/grafana/panels/network_usage_docker_combined_current_graph.json.jinja delete mode 100644 salt/grafana/panels/network_usage_docker_combined_trend_graph.json.jinja delete mode 100644 salt/grafana/panels/nsm_used_guage.json.jinja delete mode 100644 salt/grafana/panels/pcap_retention_stat.json.jinja delete mode 100644 salt/grafana/panels/process_status_graph.json.jinja delete mode 100644 salt/grafana/panels/ram_usage_guage.json.jinja delete mode 100644 salt/grafana/panels/redis_queue_graph.json.jinja delete mode 100644 salt/grafana/panels/redis_queue_stat.json.jinja delete mode 100644 salt/grafana/panels/rootfs_used_guage.json.jinja delete mode 100644 salt/grafana/panels/row_cpu.json.jinja delete mode 100644 salt/grafana/panels/row_disk_iops.json.jinja delete mode 100644 salt/grafana/panels/row_disk_usage.json.jinja delete mode 100644 salt/grafana/panels/row_docker_details.json.jinja delete mode 100644 salt/grafana/panels/row_elasticsearch.json.jinja delete mode 100644 salt/grafana/panels/row_influxdb.json.jinja delete mode 100644 salt/grafana/panels/row_logstash.json.jinja delete mode 100644 salt/grafana/panels/row_memory.json.jinja delete mode 100644 salt/grafana/panels/row_network.json.jinja delete mode 100644 salt/grafana/panels/row_overview.json.jinja delete mode 100644 salt/grafana/panels/row_packet_loss.json.jinja delete mode 100644 salt/grafana/panels/row_redis.json.jinja delete mode 100644 salt/grafana/panels/row_stenographer.json.jinja delete mode 100644 salt/grafana/panels/row_suricata.json.jinja delete mode 100644 salt/grafana/panels/row_swap.json.jinja delete mode 100644 salt/grafana/panels/row_zeek.json.jinja delete mode 100644 salt/grafana/panels/stenographer_packet_loss_graph.json.jinja delete mode 100644 salt/grafana/panels/stenographer_packet_loss_stat.json.jinja delete mode 100644 salt/grafana/panels/stenographer_pcap_retention_graph.json.jinja delete mode 100644 salt/grafana/panels/suricata_packet_loss_graph.json.jinja delete mode 100644 salt/grafana/panels/suricata_packet_loss_stat.json.jinja delete mode 100644 salt/grafana/panels/swap_io_bytes_graph.json.jinja delete mode 100644 salt/grafana/panels/swap_usage_bytes_graph.json.jinja delete mode 100644 salt/grafana/panels/swap_usage_guage.json.jinja delete mode 100644 salt/grafana/panels/swap_usage_percent_graph.json.jinja delete mode 100644 salt/grafana/panels/system_uptime.json.jinja delete mode 100644 salt/grafana/panels/system_uptime_graph.json.jinja delete mode 100644 salt/grafana/panels/uptime_docker_combined_current_graph.json.jinja delete mode 100644 salt/grafana/panels/uptime_docker_combined_trend_graph.json.jinja delete mode 100644 salt/grafana/panels/zeek_capture_loss_graph.json.jinja delete mode 100644 salt/grafana/panels/zeek_packet_loss_graph.json.jinja delete mode 100644 salt/grafana/panels/zeek_packet_loss_stat.json.jinja delete mode 100644 salt/grafana/panels/zeek_restarts_healthcheck_stat.json.jinja delete mode 100644 salt/grafana/soc_grafana.yaml delete mode 100644 salt/grafana/templates/cluster_name.json delete mode 100644 salt/grafana/templates/containers.json delete mode 100644 salt/grafana/templates/cpucount.json delete mode 100644 salt/grafana/templates/disk.json delete mode 100644 salt/grafana/templates/manint.json delete mode 100644 salt/grafana/templates/monint.json delete mode 100644 salt/grafana/templates/role.json delete mode 100644 salt/grafana/templates/searchnode.json delete mode 100644 salt/grafana/templates/servername.json diff --git a/salt/filebeat/defaults.yaml b/salt/filebeat/defaults.yaml deleted file mode 100644 index 83bb9b22e..000000000 --- a/salt/filebeat/defaults.yaml +++ /dev/null @@ -1,112 +0,0 @@ -filebeat: - config: - zeek_logs_enabled: - - conn - - dce_rpc - - dhcp - - dnp3 - - dns - - dpd - - files - - ftp - - http - - intel - - irc - - kerberos - - modbus - - mysql - - notice - - ntlm - - pe - - radius - - rfb - - rdp - - sip - - smb_files - - smb_mapping - - smtp - - snmp - - socks - - software - - ssh - - ssl - - tunnel - - weird - - x509 - - bacnet - - bacnet_discovery - - bacnet_property - - bsap_ip_header - - bsap_ip_rdb - - bsap_ip_unknown - - bsap_serial_header - - bsap_serial_rdb - - bsap_serial_rdb_ext - - bsap_serial_unknown - - cip - - cip_identity - - cip_io - - cotp - - dnp3_control - - dnp3_objects - - ecat_aoe_info - - ecat_coe_info - - ecat_dev_info - - ecat_foe_info - - ecat_log_address - - ecat_registers - - ecat_soe_info - - enip - - modbus_detailed - - modbus_mask_write_register - - modbus_read_write_multiple_registers - - opcua_binary - - opcua_binary_activate_session - - opcua_binary_activate_session_client_software_cert - - opcua_binary_activate_session_diagnostic_info - - opcua_binary_activate_session_locale_id - - opcua_binary_browse - - opcua_binary_browse_description - - opcua_binary_browse_diagnostic_info - - opcua_binary_browse_request_continuation_point - - opcua_binary_browse_response_references - - opcua_binary_browse_result - - opcua_binary_create_session - - opcua_binary_create_session_discovery - - opcua_binary_create_session_endpoints - - opcua_binary_create_session_user_token - - opcua_binary_create_subscription - - opcua_binary_diag_info_detail - - opcua_binary_get_endpoints - - opcua_binary_get_endpoints_description - - opcua_binary_get_endpoints_discovery - - opcua_binary_get_endpoints_locale_id - - opcua_binary_get_endpoints_profile_uri - - opcua_binary_get_endpoints_user_token - - opcua_binary_opensecure_channel - - opcua_binary_read - - opcua_binary_read_array_dims - - opcua_binary_read_array_dims_link - - opcua_binary_read_diagnostic_info - - opcua_binary_read_extension_object - - opcua_binary_read_extension_object_link - - opcua_binary_read_nodes_to_read - - opcua_binary_read_results - - opcua_binary_read_results_link - - opcua_binary_read_status_code - - opcua_binary_read_variant_data - - opcua_binary_read_variant_data_link - - opcua_binary_status_code_detail - - profinet - - profinet_dce_rpc - - profinet_debug - - s7comm - - s7comm_plus - - s7comm_read_szl - - s7comm_upload_download - - stun - - stun_nat - - tds - - tds_rpc - - tds_sql_batch - - wireguard diff --git a/salt/filebeat/etc/filebeat.yml b/salt/filebeat/etc/filebeat.yml deleted file mode 100644 index 839bd12f5..000000000 --- a/salt/filebeat/etc/filebeat.yml +++ /dev/null @@ -1,674 +0,0 @@ -{%- if grains.role == 'so-heavynode' %} -{%- set MANAGER = salt['grains.get']('host' '') %} -{%- else %} -{%- set MANAGER = salt['grains.get']('master') %} -{%- endif %} -{%- set ES_USER = salt['pillar.get']('elasticsearch:auth:users:so_elastic_user:user', '') %} -{%- set ES_PASS = salt['pillar.get']('elasticsearch:auth:users:so_elastic_user:pass', '') %} - -{%- set HOSTNAME = salt['grains.get']('host', '') %} -{%- set ZEEKVER = salt['pillar.get']('global:mdengine', '') %} -{%- set STRELKAENABLED = salt['pillar.get']('strelka:enabled', '0') %} -{%- set RITAENABLED = salt['pillar.get']('rita:enabled', False) -%} -{%- set FBMEMEVENTS = salt['pillar.get']('filebeat:mem_events', 2048) -%} -{%- set FBMEMFLUSHMINEVENTS = salt['pillar.get']('filebeat:mem_flush_min_events', 2048) -%} -{%- set FBLSWORKERS = salt['pillar.get']('filebeat:ls_workers', 1) -%} -{%- set FBLSBULKMAXSIZE = salt['pillar.get']('filebeat:ls_bulk_max_size', 2048) -%} -{%- set FBLOGGINGLEVEL = salt['pillar.get']('filebeat:logging:level', 'warning') -%} - -name: {{ HOSTNAME }} - -#================================ Logging ====================================== -# There are four options for the log output: file, stderr, syslog, eventlog -# The file output is the default. - -# Sets log level. The default log level is info. -# Available log levels are: error, warning, info, debug -logging.level: {{ FBLOGGINGLEVEL }} - -# Enable debug output for selected components. To enable all selectors use ["*"] -# Other available selectors are "beat", "publish", "service" -# Multiple selectors can be chained. -#logging.selectors: [ ] - -# Send all logging output to syslog. The default is false. -#logging.to_syslog: false - -# Send all logging output to Windows Event Logs. The default is false. -#logging.to_eventlog: false - -# If enabled, filebeat periodically logs its internal metrics that have changed -# in the last period. For each metric that changed, the delta from the value at -# the beginning of the period is logged. Also, the total values for -# all non-zero internal metrics are logged on shutdown. The default is true. -#logging.metrics.enabled: true - -# The period after which to log the internal metrics. The default is 30s. -#logging.metrics.period: 30s - -# Logging to rotating files. Set logging.to_files to false to disable logging to -# files. -logging.to_files: true -logging.files: - # Configure the path where the logs are written. The default is the logs directory - # under the home path (the binary location). - path: /usr/share/filebeat/logs - - # The name of the files where the logs are written to. - name: filebeat.log - - # Configure log file size limit. If limit is reached, log file will be - # automatically rotated - rotateeverybytes: 10485760 # = 10MB - - # Rotate on startup - rotateonstartup: false - - # Number of rotated log files to keep. Oldest files will be deleted first. - keepfiles: 7 - - # The permissions mask to apply when rotating log files. The default value is 0600. - # Must be a valid Unix-style file permissions mask expressed in octal notation. - #permissions: 0600 - -# Set to true to log messages in json format. -#logging.json: false - - - -#========================== Modules configuration ============================ -filebeat.config.modules: - enabled: true - path: ${path.config}/modules.d/*.yml - -filebeat.modules: -#=========================== Filebeat prospectors ============================= - -# List of prospectors to fetch data. -filebeat.inputs: -#------------------------------ Log prospector -------------------------------- -- type: udp - enabled: true - host: "0.0.0.0:514" - fields: - module: syslog - dataset: syslog - pipeline: "syslog" - index: "so-syslog" - processors: - - drop_fields: - fields: ["source", "prospector", "input", "offset", "beat"] - fields_under_root: true - -- type: tcp - enabled: true - host: "0.0.0.0:514" - fields: - module: syslog - dataset: syslog - pipeline: "syslog" - index: "so-syslog" - processors: - - drop_fields: - fields: ["source", "prospector", "input", "offset", "beat"] - fields_under_root: true - -{%- if grains['role'] in ['so-eval', 'so-standalone', 'so-manager', 'so-managersearch', 'so-import'] %} -- type: filestream - id: logscan - paths: - - /logs/logscan/alerts.log - fields: - module: logscan - dataset: alert - processors: - - drop_fields: - fields: ["source", "prospector", "input", "offset", "beat"] - fields_under_root: true - clean_removed: true - close_removed: false -{%- endif %} - -{%- if grains['role'] in ['so-eval', 'so-standalone', 'so-sensor', 'so-helix', 'so-heavynode', 'so-import'] %} - {%- if ZEEKVER != 'SURICATA' %} - {% import_yaml 'filebeat/defaults.yaml' as FBD with context %} - - {% set FBCONFIG = salt['pillar.get']('filebeat:zeek_logs_enabled', default=FBD.filebeat, merge=True) %} - - {%- for LOGNAME in FBCONFIG.zeek_logs_enabled %} -- type: filestream - id: zeek-{{ LOGNAME }} - paths: - - /nsm/zeek/logs/current/{{ LOGNAME }}.log - fields: - module: zeek - dataset: {{ LOGNAME }} - category: network - processors: - {%- if LOGNAME is match('^bacnet*|^bsap*|^cip*|^cotp*|^dnp3*|^ecat*|^enip*|^modbus*|^opcua*|^profinet*|^s7comm*') %} - - add_tags: - tags: ["ics"] - {%- endif %} - - drop_fields: - fields: ["source", "prospector", "input", "offset", "beat"] - - fields_under_root: true - clean_removed: true - close_removed: false - -- type: filestream - id: import-zeek={{ LOGNAME }} - paths: - - /nsm/import/*/zeek/logs/{{ LOGNAME }}.log - fields: - module: zeek - dataset: {{ LOGNAME }} - category: network - imported: true - processors: - {%- if LOGNAME is match('^bacnet*|^bsap*|^cip*|^cotp*|^dnp3*|^ecat*|^enip*|^modbus*|^opcua*|^profinet*|^s7comm*') %} - - add_tags: - tags: ["ics"] - {%- endif %} - - add_tags: - tags: ["import"] - - dissect: - tokenizer: "/nsm/import/%{import.id}/zeek/logs/%{import.file}" - field: "log.file.path" - target_prefix: "" - - drop_fields: - fields: ["source", "prospector", "input", "offset", "beat"] - - fields_under_root: true - clean_removed: false - close_removed: false - {%- endfor %} - {%- endif %} - -- type: filestream - id: suricata-eve - paths: - - /nsm/suricata/eve*.json - fields: - module: suricata - dataset: common - category: network - - processors: - - drop_fields: - fields: ["source", "prospector", "input", "offset", "beat"] - - fields_under_root: true - clean_removed: false - close_removed: false - -- type: filestream - id: import-suricata - paths: - - /nsm/import/*/suricata/eve*.json - fields: - module: suricata - dataset: common - category: network - imported: true - processors: - - add_tags: - tags: ["import"] - - dissect: - tokenizer: "/nsm/import/%{import.id}/suricata/%{import.file}" - field: "log.file.path" - target_prefix: "" - - drop_fields: - fields: ["source", "prospector", "input", "offset", "beat"] - - fields_under_root: true - clean_removed: false - close_removed: false - {%- if STRELKAENABLED == 1 %} -- type: filestream - id: strelka - paths: - - /nsm/strelka/log/strelka.log - fields: - module: strelka - category: file - dataset: file - - processors: - - drop_fields: - fields: ["source", "prospector", "input", "offset", "beat"] - - fields_under_root: true - clean_removed: false - close_removed: false - - {%- endif %} -{%- endif %} - -{%- if RITAENABLED %} -- type: filestream - id: rita-beacon - paths: - - /nsm/rita/beacons.csv - exclude_lines: ['^Score', '^Source', '^Domain', '^No results'] - fields: - module: rita - dataset: beacon - category: network - processors: - - drop_fields: - fields: ["source", "prospector", "input", "offset", "beat"] - fields_under_root: true - pipeline: "rita.beacon" - index: "so-rita" - -- type: filestream - id: rita-connection - paths: - - /nsm/rita/long-connections.csv - - /nsm/rita/open-connections.csv - exclude_lines: ['^Source', '^No results'] - fields: - module: rita - dataset: connection - category: network - processors: - - drop_fields: - fields: ["source", "prospector", "input", "offset", "beat"] - fields_under_root: true - pipeline: "rita.connection" - index: "so-rita" - -- type: filestream - id: rita-dns - paths: - - /nsm/rita/exploded-dns.csv - exclude_lines: ['^Domain', '^No results'] - fields: - module: rita - dataset: dns - category: network - processors: - - drop_fields: - fields: ["source", "prospector", "input", "offset", "beat"] - fields_under_root: true - pipeline: "rita.dns" - index: "so-rita" -{%- endif %} - -{%- if grains['role'] in ['so-eval', 'so-standalone', 'so-manager', 'so-managersearch', 'so-import'] %} -- type: filestream - id: kratos - paths: - - /logs/kratos/kratos.log - fields: - module: kratos - category: host - processors: - - decode_json_fields: - fields: ["message"] - target: "" - add_error_key: true - - rename: - fields: - - from: "audience" - to: "event.dataset" - ignore_missing: true - - add_fields: - when: - not: - has_fields: ['event.dataset'] - target: '' - fields: - event.dataset: access - pipeline: "kratos" - fields_under_root: true - clean_removed: false - close_removed: false -{%- endif %} - -{%- if grains.role == 'so-idh' %} -- type: filestream - id: idh - paths: - - /nsm/idh/opencanary.log - fields: - module: opencanary - dataset: idh - category: host - tags: beat-ext - processors: - - decode_json_fields: - fields: ["message"] - target: "" - add_error_key: true - - drop_fields: - when: - equals: - logtype: 1001 - fields: ["src_host", "src_port", "dst_host", "dst_port" ] - ignore_missing: true - - rename: - fields: - - from: "src_host" - to: "source.ip" - - from: "src_port" - to: "source.port" - - from: "dst_host" - to: "destination.host" - - from: "dst_port" - to: "destination.port" - ignore_missing: true - - convert: - fields: - - {from: "logtype", to: "event.code", type: "string"} - ignore_missing: true - - drop_fields: - fields: '["prospector", "input", "offset", "beat"]' - fields_under_root: true - clean_removed: false - close_removed: false -{%- endif %} - -{%- if INPUTS %} -# USER PILLAR DEFINED INPUTS -{{ INPUTS | yaml(False) }} -{%- endif %} - -{% if OUTPUT -%} -# USER PILLAR DEFINED OUTPUT -{%- set types = OUTPUT.keys() | list %} -{%- set type = types[0] %} -output.{{ type }}: - {%- for i in OUTPUT[type].items() %} - {{ i[0] }}: {{ i[1]}} - {%- endfor %} -{%- else %} -#----------------------------- Elasticsearch/Logstash output --------------------------------- - {%- if grains['role'] in ["so-eval", "so-import"] %} -output.elasticsearch: - enabled: true - hosts: ["https://{{ MANAGER }}:9200"] - username: "{{ ES_USER }}" - password: "{{ ES_PASS }}" - ssl.certificate_authorities: ["/usr/share/filebeat/intraca.crt"] - pipelines: - - pipeline: "%{[module]}.%{[dataset]}" - indices: - - index: "so-import" - when.contains: - tags: "import" - - index: "so-zeek" - when.contains: - module: "zeek" - - index: "so-ids" - when.contains: - module: "suricata" - - index: "so-ossec" - when.contains: - module: "ossec" - - index: "so-osquery" - when.contains: - module: "osquery" - - index: "so-strelka" - when.contains: - module: "strelka" - - index: "so-logscan" - when.contains: - module: "logscan" - - index: "so-elasticsearch-%{+YYYY.MM.dd}" - when.contains: - event.module: "elasticsearch" - - index: "so-kibana-%{+YYYY.MM.dd}" - when.contains: - event.module: "kibana" - -setup.template.enabled: false - {%- else %} - -output.logstash: - # Boolean flag to enable or disable the output module. - enabled: true - - # The Logstash hosts - hosts: -{# dont let filebeat send to a node designated as dmz #} -{% import_yaml 'logstash/dmz_nodes.yaml' as dmz_nodes -%} -{% if dmz_nodes.logstash.dmz_nodes -%} -{% set dmz_nodes = dmz_nodes.logstash.dmz_nodes -%} -{% else -%} -{% set dmz_nodes = [] -%} -{% endif -%} -{%- if grains.role in ['so-sensor', 'so-fleet', 'so-searchnode', 'so-idh'] %} -{%- set LOGSTASH = namespace() %} -{%- set LOGSTASH.count = 0 %} -{%- set LOGSTASH.loadbalance = false %} -{%- set node_data = salt['pillar.get']('logstash:nodes') %} -{%- for node_type, node_details in node_data.items() | sort -%} -{%- if node_type in ['manager', 'managersearch', 'standalone', 'receiver' ] %} -{%- for hostname in node_data[node_type].keys() %} -{%- if hostname not in dmz_nodes %} -{%- set LOGSTASH.count = LOGSTASH.count + 1 %} - - "{{ hostname }}:5644" #{{ node_details[hostname].ip }} -{%- endif %} -{%- endfor %} -{%- endif %} -{%- if LOGSTASH.count > 1 %} -{%- set LOGSTASH.loadbalance = true %} -{%- endif %} -{%- endfor %} - - loadbalance: {{ LOGSTASH.loadbalance | lower }} -{%- else %} - - "{{ grains.host }}:5644" -{%- endif %} - - # Number of workers per Logstash host. - worker: {{ FBLSWORKERS }} - - # Number of records to send to Logstash input at a time - bulk_max_size: {{ FBLSBULKMAXSIZE }} - - # Set gzip compression level. - #compression_level: 3 - - # Enable SSL support. SSL is automatically enabled, if any SSL setting is set. - #ssl.enabled: true - - # Configure SSL verification mode. If `none` is configured, all server hosts - # and certificates will be accepted. In this mode, SSL based connections are - # susceptible to man-in-the-middle attacks. Use only for testing. Default is - # `full`. - ssl.verification_mode: full - - # List of supported/valid TLS versions. By default all TLS versions 1.0 up to - # 1.2 are enabled. - ssl.supported_protocols: [TLSv1.0, TLSv1.1, TLSv1.2] - - # Optional SSL configuration options. SSL is off by default. - # List of root certificates for HTTPS server verifications - ssl.certificate_authorities: ["/usr/share/filebeat/intraca.crt"] - - # Certificate for SSL client authentication - ssl.certificate: "/usr/share/filebeat/filebeat.crt" - - # Client Certificate Key - ssl.key: "/usr/share/filebeat/filebeat.key" - -setup.template.enabled: false - # A dictionary of settings to place into the settings.index dictionary - # of the Elasticsearch template. For more details, please check - # https://www.elastic.co/guide/en/elasticsearch/reference/current/mapping.html - #index: - #number_of_shards: 1 - #codec: best_compression - #number_of_routing_shards: 30 - - # A dictionary of settings for the _source field. For more details, please check - # https://www.elastic.co/guide/en/elasticsearch/reference/current/mapping-source-field.html - #_source: - #enabled: false - {%- endif %} -{% endif %} -#============================== Kibana ===================================== - -# Starting with Beats version 6.0.0, the dashboards are loaded via the Kibana API. -# This requires a Kibana endpoint configuration. -#setup.kibana: - - # Kibana Host - # Scheme and port can be left out and will be set to the default (http and 5601) - # In case you specify and additional path, the scheme is required: http://localhost:5601/path - # IPv6 addresses should always be defined as: https://[2001:db8::1]:5601 - #host: "localhost:5601" - - # Optional protocol and basic auth credentials. - #protocol: "https" - #username: "elastic" - #password: "changeme" - - # Optional HTTP Path - #path: "" - - # Use SSL settings for HTTPS. Default is true. - #ssl.enabled: true - - # Configure SSL verification mode. If `none` is configured, all server hosts - # and certificates will be accepted. In this mode, SSL based connections are - # susceptible to man-in-the-middle attacks. Use only for testing. Default is - # `full`. - #ssl.verification_mode: full - - # List of supported/valid TLS versions. By default all TLS versions 1.0 up to - # 1.2 are enabled. - #ssl.supported_protocols: [TLSv1.0, TLSv1.1, TLSv1.2] - - # SSL configuration. By default is off. - # List of root certificates for HTTPS server verifications - #ssl.certificate_authorities: ["/etc/pki/root/ca.pem"] - - # Certificate for SSL client authentication - #ssl.certificate: "/etc/pki/client/cert.pem" - - # Client Certificate Key - #ssl.key: "/etc/pki/client/cert.key" - - # Optional passphrase for decrypting the Certificate Key. - #ssl.key_passphrase: '' - - # Configure cipher suites to be used for SSL connections - #ssl.cipher_suites: [] - - # Configure curve types for ECDHE based cipher suites - #ssl.curve_types: [] - - - - - -#============================== Xpack Monitoring ===================================== -# filebeat can export internal metrics to a central Elasticsearch monitoring cluster. -# This requires xpack monitoring to be enabled in Elasticsearch. -# The reporting is disabled by default. - -# Set to true to enable the monitoring reporter. -#xpack.monitoring.enabled: false - -# Uncomment to send the metrics to Elasticsearch. Most settings from the -# Elasticsearch output are accepted here as well. Any setting that is not set is -# automatically inherited from the Elasticsearch output configuration, so if you -# have the Elasticsearch output configured, you can simply uncomment the -# following line, and leave the rest commented out. -#xpack.monitoring.elasticsearch: - - # Array of hosts to connect to. - # Scheme and port can be left out and will be set to the default (http and 9200) - # In case you specify and additional path, the scheme is required: http://localhost:9200/path - # IPv6 addresses should always be defined as: https://[2001:db8::1]:9200 - #hosts: ["localhost:9200"] - - # Set gzip compression level. - #compression_level: 0 - - # Optional protocol and basic auth credentials. - #protocol: "https" - #username: "beats_system" - #password: "changeme" - - # Dictionary of HTTP parameters to pass within the url with index operations. - #parameters: - #param1: value1 - #param2: value2 - - # Custom HTTP headers to add to each request - #headers: - # X-My-Header: Contents of the header - - # Proxy server url - #proxy_url: http://proxy:3128 - - # The number of times a particular Elasticsearch index operation is attempted. If - # the indexing operation doesn't succeed after this many retries, the events are - # dropped. The default is 3. - #max_retries: 3 - - # The maximum number of events to bulk in a single Elasticsearch bulk API index request. - # The default is 50. - #bulk_max_size: 50 - - # Configure http request timeout before failing an request to Elasticsearch. - #timeout: 90 - - # Use SSL settings for HTTPS. - #ssl.enabled: true - - # Configure SSL verification mode. If `none` is configured, all server hosts - # and certificates will be accepted. In this mode, SSL based connections are - # susceptible to man-in-the-middle attacks. Use only for testing. Default is - # `full`. - #ssl.verification_mode: full - - # List of supported/valid TLS versions. By default all TLS versions 1.0 up to - # 1.2 are enabled. - #ssl.supported_protocols: [TLSv1.0, TLSv1.1, TLSv1.2] - - # SSL configuration. By default is off. - # List of root certificates for HTTPS server verifications - #ssl.certificate_authorities: ["/etc/pki/root/ca.pem"] - - # Certificate for SSL client authentication - #ssl.certificate: "/etc/pki/client/cert.pem" - - # Client Certificate Key - #ssl.key: "/etc/pki/client/cert.key" - - # Optional passphrase for decrypting the Certificate Key. - #ssl.key_passphrase: '' - - # Configure cipher suites to be used for SSL connections - #ssl.cipher_suites: [] - - # Configure curve types for ECDHE based cipher suites - #ssl.curve_types: [] - - # Configure what types of renegotiation are supported. Valid options are - # never, once, and freely. Default is never. - #ssl.renegotiation: never - -#================================ HTTP Endpoint ====================================== -# Each beat can expose internal metrics through a HTTP endpoint. For security -# reasons the endpoint is disabled by default. This feature is currently experimental. -# Stats can be access through http://localhost:5066/stats . For pretty JSON output -# append ?pretty to the URL. - -# Defines if the HTTP endpoint is enabled. -http.enabled: true - -# The HTTP endpoint will bind to this hostname or IP address. It is recommended to use only localhost. -http.host: 0.0.0.0 - -# Port on which the HTTP endpoint will bind. Default is 5066. -http.port: 5066 - -queue.mem.events: {{ FBMEMEVENTS }} -queue.mem.flush.min_events: {{ FBMEMFLUSHMINEVENTS }} diff --git a/salt/filebeat/etc/module-setup.yml b/salt/filebeat/etc/module-setup.yml deleted file mode 100644 index d0ecd5d22..000000000 --- a/salt/filebeat/etc/module-setup.yml +++ /dev/null @@ -1,10 +0,0 @@ -{%- set ES = salt['grains.get']('master') -%} -{%- set ES_USER = salt['pillar.get']('elasticsearch:auth:users:so_elastic_user:user', '') %} -{%- set ES_PASS = salt['pillar.get']('elasticsearch:auth:users:so_elastic_user:pass', '') %} - -output.elasticsearch: - enabled: true - hosts: ["https://{{ ES }}:9200"] - username: "{{ ES_USER }}" - password: "{{ ES_PASS }}" - ssl.certificate_authorities: ["/usr/share/filebeat/intraca.crt"] diff --git a/salt/filebeat/etc/module_config.yml.jinja b/salt/filebeat/etc/module_config.yml.jinja deleted file mode 100644 index 5d8782c01..000000000 --- a/salt/filebeat/etc/module_config.yml.jinja +++ /dev/null @@ -1,2 +0,0 @@ -# DO NOT EDIT THIS FILE -{{ MODULES|yaml(False) }} diff --git a/salt/filebeat/init.sls b/salt/filebeat/init.sls deleted file mode 100644 index 988807f82..000000000 --- a/salt/filebeat/init.sls +++ /dev/null @@ -1,162 +0,0 @@ -# Copyright Security Onion Solutions LLC and/or licensed to Security Onion Solutions LLC under one -# or more contributor license agreements. Licensed under the Elastic License 2.0 as shown at -# https://securityonion.net/license; you may not use this file except in compliance with the -# Elastic License 2.0. - -{% from 'allowed_states.map.jinja' import allowed_states %} -{% if sls in allowed_states %} -{% from 'docker/docker.map.jinja' import DOCKER %} -{% from 'vars/globals.map.jinja' import GLOBALS %} -{% from 'filebeat/modules.map.jinja' import MODULESMERGED with context %} -{% from 'filebeat/modules.map.jinja' import MODULESENABLED with context %} -{% from 'filebeat/map.jinja' import FILEBEAT_EXTRA_HOSTS with context %} -{% set ES_INCLUDED_NODES = ['so-eval', 'so-standalone', 'so-managersearch', 'so-searchnode', 'so-heavynode', 'so-import'] %} - -include: - - ssl -#only include elastic state for certain nodes -{% if grains.role in ES_INCLUDED_NODES %} - - elasticsearch -{% endif %} - -filebeatetcdir: - file.directory: - - name: /opt/so/conf/filebeat/etc - - user: 939 - - group: 939 - - makedirs: True - -filebeatmoduledir: - file.directory: - - name: /opt/so/conf/filebeat/modules - - user: root - - group: root - - makedirs: True - -filebeatlogdir: - file.directory: - - name: /opt/so/log/filebeat - - user: 939 - - group: 939 - - makedirs: True - -filebeatpkidir: - file.directory: - - name: /opt/so/conf/filebeat/etc/pki - - user: 939 - - group: 939 - - makedirs: True -fileregistrydir: - file.directory: - - name: /opt/so/conf/filebeat/registry - - user: 939 - - group: 939 - - makedirs: True - -# This needs to be owned by root -filebeatconf: - file.managed: - - name: /opt/so/conf/filebeat/etc/filebeat.yml - - source: salt://filebeat/etc/filebeat.yml - - user: root - - group: root - - template: jinja - - defaults: - INPUTS: {{ salt['pillar.get']('filebeat:config:inputs', {}) }} - OUTPUT: {{ salt['pillar.get']('filebeat:config:output', {}) }} - - show_changes: False - -# Filebeat module config file -filebeatmoduleconf: - file.managed: - - name: /opt/so/conf/filebeat/etc/module-setup.yml - - source: salt://filebeat/etc/module-setup.yml - - user: root - - group: root - - mode: 640 - - template: jinja - - show_changes: False - -merged_module_conf: - file.managed: - - name: /opt/so/conf/filebeat/modules/modules.yml - - source: salt://filebeat/etc/module_config.yml.jinja - - template: jinja - - defaults: - MODULES: {{ MODULESENABLED }} - -so_module_conf_remove: - file.absent: - - name: /opt/so/conf/filebeat/modules/securityonion.yml - -thirdyparty_module_conf_remove: - file.absent: - - name: /opt/so/conf/filebeat/modules/thirdparty.yml - -so-filebeat: - docker_container.running: - - image: {{ GLOBALS.registry_host }}:5000/{{ GLOBALS.image_repo }}/so-filebeat:{{ GLOBALS.so_version }} - - hostname: so-filebeat - - user: root - - networks: - - sobridge: - - ipv4_address: {{ DOCKER.containers['so-filebeat'].ip }} - - extra_hosts: {{ FILEBEAT_EXTRA_HOSTS }} - - binds: - - /nsm:/nsm:ro - - /opt/so/log/filebeat:/usr/share/filebeat/logs:rw - - /opt/so/conf/filebeat/etc/filebeat.yml:/usr/share/filebeat/filebeat.yml:ro - - /opt/so/conf/filebeat/etc/module-setup.yml:/usr/share/filebeat/module-setup.yml:ro - - /nsm/wazuh/logs/alerts:/wazuh/alerts:ro - - /nsm/wazuh/logs/archives:/wazuh/archives:ro - - /opt/so/conf/filebeat/modules:/usr/share/filebeat/modules.d - - /opt/so/conf/filebeat/etc/pki/filebeat.crt:/usr/share/filebeat/filebeat.crt:ro - - /opt/so/conf/filebeat/etc/pki/filebeat.key:/usr/share/filebeat/filebeat.key:ro - - /opt/so/conf/filebeat/registry:/usr/share/filebeat/data/registry:rw - - /etc/ssl/certs/intca.crt:/usr/share/filebeat/intraca.crt:ro - - /opt/so/log:/logs:ro - - port_bindings: - {% for BINDING in DOCKER.containers['so-filebeat'].port_bindings %} - - {{ BINDING }} - {% endfor %} -{% for module in MODULESMERGED.modules.keys() %} - {% for submodule in MODULESMERGED.modules[module] %} - {% if MODULESMERGED.modules[module][submodule].enabled and MODULESMERGED.modules[module][submodule]["var.syslog_port"] is defined %} - - {{ MODULESMERGED.modules[module][submodule].get("var.syslog_host", "0.0.0.0") }}:{{ MODULESMERGED.modules[module][submodule]["var.syslog_port"] }}:{{ MODULESMERGED.modules[module][submodule]["var.syslog_port"] }}/tcp - - {{ MODULESMERGED.modules[module][submodule].get("var.syslog_host", "0.0.0.0") }}:{{ MODULESMERGED.modules[module][submodule]["var.syslog_port"] }}:{{ MODULESMERGED.modules[module][submodule]["var.syslog_port"] }}/udp - {% endif %} - {% endfor %} -{% endfor %} - - watch: - - file: filebeatconf - - require: - - file: filebeatconf - - file: filebeatmoduleconf - - file: filebeatmoduledir - - x509: conf_filebeat_crt - - x509: conf_filebeat_key - - x509: trusttheca - -{% if grains.role in ES_INCLUDED_NODES %} -run_module_setup: - cmd.run: - - name: /usr/sbin/so-filebeat-module-setup - - require: - - file: filebeatmoduleconf - - docker_container: so-filebeat - - onchanges: - - docker_container: so-elasticsearch -{% endif %} - -append_so-filebeat_so-status.conf: - file.append: - - name: /opt/so/conf/so-status/so-status.conf - - text: so-filebeat - -{% else %} - -{{sls}}_state_not_allowed: - test.fail_without_changes: - - name: {{sls}}_state_not_allowed - -{% endif %} diff --git a/salt/filebeat/map.jinja b/salt/filebeat/map.jinja deleted file mode 100644 index bcbec1a8c..000000000 --- a/salt/filebeat/map.jinja +++ /dev/null @@ -1,15 +0,0 @@ -{% from 'vars/globals.map.jinja' import GLOBALS %} -{% set role = GLOBALS.role %} -{% set FILEBEAT_EXTRA_HOSTS = [] %} -{% if role in ['so-sensor', 'so-fleet', 'so-searchnode', 'so-idh'] %} - {% set node_data = salt['pillar.get']('logstash:nodes') %} - {% for node_type, node_details in node_data.items() | sort %} - {% if node_type in ['manager', 'managersearch', 'standalone', 'receiver' ] %} - {% for hostname in node_data[node_type].keys() %} - {% do FILEBEAT_EXTRA_HOSTS.append({hostname:node_details[hostname].ip}) %} - {% endfor %} - {% endif %} - {% endfor %} -{% endif %} - -{% do FILEBEAT_EXTRA_HOSTS.append({GLOBALS.hostname:GLOBALS.node_ip}) %} diff --git a/salt/filebeat/modules.map.jinja b/salt/filebeat/modules.map.jinja deleted file mode 100644 index c4a0a6db7..000000000 --- a/salt/filebeat/modules.map.jinja +++ /dev/null @@ -1,18 +0,0 @@ -{% import_yaml 'filebeat/thirdpartydefaults.yaml' as TPDEFAULTS %} -{% import_yaml 'filebeat/securityoniondefaults.yaml' as SODEFAULTS %} -{% set THIRDPARTY = salt['pillar.get']('filebeat:third_party_filebeat', default=TPDEFAULTS.third_party_filebeat, merge=True) %} -{% set SO = salt['pillar.get']('filebeat:securityonion_filebeat', default=SODEFAULTS.securityonion_filebeat, merge=True) %} -{% set MODULESMERGED = salt['defaults.merge'](SO, THIRDPARTY, in_place=False) %} - -{% set MODULESENABLED = [] %} -{% for module in MODULESMERGED.modules.keys() %} - {% set ENABLEDFILESETS = {} %} - {% for fileset in MODULESMERGED.modules[module] %} - {% if MODULESMERGED.modules[module][fileset].get('enabled', False) %} - {% do ENABLEDFILESETS.update({'module': module, fileset: MODULESMERGED.modules[module][fileset]}) %} - {% endif %} - {% endfor %} - {% if ENABLEDFILESETS|length > 0 %} - {% do MODULESENABLED.append(ENABLEDFILESETS) %} - {% endif %} -{% endfor %} diff --git a/salt/filebeat/pillar.example b/salt/filebeat/pillar.example deleted file mode 100644 index 94be16717..000000000 --- a/salt/filebeat/pillar.example +++ /dev/null @@ -1,22 +0,0 @@ -filebeat: - config: - inputs: - - type: filestream - paths: - - /nsm/mylogdir/mylog.log - fields: - module: mymodule - dataset: mydataset - category: mycategory - - processors: - - drop_fields: - fields: '["source", "prospector", "input", "offset", "beat"]' - - fields_under_root: true - clean_removed: false - close_removed: false - output: - file: - path: "/tmp/filebeat" - filename: filebeat diff --git a/salt/filebeat/securityoniondefaults.yaml b/salt/filebeat/securityoniondefaults.yaml deleted file mode 100644 index b97088972..000000000 --- a/salt/filebeat/securityoniondefaults.yaml +++ /dev/null @@ -1,30 +0,0 @@ -{% set ZEEKLOGLOOKUP = { - 'conn': 'connection', -} %} -securityonion_filebeat: - modules: - {%- if grains['role'] in ['so-manager', 'so-eval', 'so-managersearch', 'so-standalone','so-searchnode', 'so-hotnode', 'so-warmnode', 'so-heavynode'] %} - elasticsearch: - server: - enabled: true - var.paths: ["/logs/elasticsearch/*.log"] - logstash: - log: - enabled: true - var.paths: ["/logs/logstash.log"] - {%- endif %} - {%- if grains['role'] in ['so-manager', 'so-eval', 'so-managersearch', 'so-standalone'] %} - kibana: - log: - enabled: true - var.paths: ["/logs/kibana/kibana.log"] - {%- endif %} - {%- if grains['role'] in ['so-manager', 'so-eval', 'so-managersearch', 'so-standalone', 'so-heavynode'] %} - redis: - log: - enabled: true - var.paths: ["/logs/redis.log"] - slowlog: - enabled: false - {%- endif %} - \ No newline at end of file diff --git a/salt/filebeat/thirdpartydefaults.yaml b/salt/filebeat/thirdpartydefaults.yaml deleted file mode 100644 index 48411cad9..000000000 --- a/salt/filebeat/thirdpartydefaults.yaml +++ /dev/null @@ -1,261 +0,0 @@ -third_party_filebeat: - modules: - aws: - cloudtrail: - enabled: false - cloudwatch: - enabled: false - ec2: - enabled: false - elb: - enabled: false - s3access: - enabled: false - vpcflow: - enabled: false - azure: - activitylogs: - enabled: false - platformlogs: - enabled: false - auditlogs: - enabled: false - signinlogs: - enabled: false - barracuda: - waf: - enabled: false - var.input: udp - var.syslog_host: 0.0.0.0 - var.syslog_port: 9503 - spamfirewall: - enabled: false - var.input: udp - var.syslog_host: 0.0.0.0 - var.syslog_port: 9524 - bluecoat: - director: - enabled: false - var.input: udp - var.syslog_host: 0.0.0.0 - var.syslog_port: 9505 - cef: - log: - enabled: false - var.syslog_host: 0.0.0.0 - var.syslog_port: 9003 - checkpoint: - firewall: - enabled: false - var.syslog_host: 0.0.0.0 - var.syslog_port: 9505 - cisco: - asa: - enabled: false - var.syslog_host: 0.0.0.0 - var.syslog_port: 9001 - ftd: - enabled: false - var.syslog_host: 0.0.0.0 - var.syslog_port: 9003 - ios: - enabled: false - var.syslog_host: 0.0.0.0 - var.syslog_port: 9002 - nexus: - enabled: false - var.syslog_host: 0.0.0.0 - var.syslog_port: 9506 - meraki: - enabled: false - var.syslog_host: 0.0.0.0 - var.syslog_port: 9525 - umbrella: - enabled: false - amp: - enabled: false - cylance: - protect: - enabled: false - var.input: udp - var.syslog_host: 0.0.0.0 - var.syslog_port: 9508 - f5: - bigipapm: - enabled: false - var.input: udp - var.syslog_host: 0.0.0.0 - var.syslog_port: 9504 - bigipafm: - enabled: false - var.input: udp - var.syslog_host: 0.0.0.0 - var.syslog_port: 9528 - fortinet: - firewall: - enabled: false - var.input: udp - var.syslog_host: 0.0.0.0 - var.syslog_port: 9004 - clientendpoint: - enabled: false - var.input: udp - var.syslog_host: 0.0.0.0 - var.syslog_port: 9510 - fortimail: - enabled: false - var.input: udp - var.syslog_port: 9350 - gcp: - vpcflow: - enabled: false - firewall: - enabled: false - audit: - enabled: false - google_workspace: - saml: - enabled: false - user_accounts: - enabled: false - login: - enabled: false - admin: - enabled: false - drive: - enabled: false - groups: - enabled: false - imperva: - securesphere: - enabled: false - var.input: udp - var.syslog_host: 0.0.0.0 - var.syslog_port: 9511 - infoblox: - nios: - enabled: false - var.input: udp - var.syslog_host: 0.0.0.0 - var.syslog_port: 9512 - juniper: - junos: - enabled: false - var.input: udp - var.syslog_host: 0.0.0.0 - var.syslog_port: 9513 - netscreen: - enabled: false - var.input: udp - var.syslog_host: 0.0.0.0 - var.syslog_port: 9523 - srx: - enabled: false - var.input: udp - var.syslog_host: 0.0.0.0 - var.syslog_port: 9006 - microsoft: - defender_atp: - enabled: false - m365_defender: - enabled: false - dhcp: - enabled: false - var.input: udp - var.syslog_host: 0.0.0.0 - var.syslog_port: 9515 - misp: - threat: - enabled: false - netflow: - log: - enabled: false - var.netflow_host: 0.0.0.0 - var.netflow_port: 2055 - var.internal_networks: - - private - netscout: - sightline: - enabled: false - var.input: udp - var.syslog_host: 0.0.0.0 - var.syslog_port: 9502 - o365: - audit: - enabled: false - okta: - system: - enabled: false - proofpoint: - emailsecurity: - enabled: false - var.input: udp - var.syslog_host: 0.0.0.0 - var.syslog_port: 9531 - radware: - defensepro: - enabled: false - var.input: udp - var.syslog_host: 0.0.0.0 - var.syslog_port: 9518 - snort: - log: - enabled: false - var.input: udp - var.syslog_host: 0.0.0.0 - var.syslog_port: 9532 - snyk: - audit: - enabled: false - vulnerabilities: - enabled: false - sonicwall: - firewall: - enabled: false - var.input: udp - var.syslog_host: 0.0.0.0 - var.syslog_port: 9519 - sophos: - xg: - enabled: false - var.input: udp - var.syslog_host: 0.0.0.0 - var.syslog_port: 9005 - utm: - enabled: false - var.input: udp - var.syslog_host: 0.0.0.0 - var.syslog_port: 9533 - squid: - log: - enabled: false - var.input: udp - var.syslog_host: 0.0.0.0 - var.syslog_port: 9520 - tomcat: - log: - enabled: false - var.input: udp - var.syslog_host: 0.0.0.0 - var.syslog_port: 9501 - threatintel: - abuseurl: - enabled: false - abusemalware: - enabled: false - misp: - enabled: false - malwarebazaar: - enabled: false - otx: - enabled: false - anomali: - enabled: false - anomalithreatstream: - enabled: false - zscaler: - zia: - enabled: false - var.input: udp - var.syslog_host: 0.0.0.0 - var.syslog_port: 9521 diff --git a/salt/grafana/dashboards/common_template.json.jinja b/salt/grafana/dashboards/common_template.json.jinja deleted file mode 100644 index 4c6745c3c..000000000 --- a/salt/grafana/dashboards/common_template.json.jinja +++ /dev/null @@ -1,64 +0,0 @@ -{ - "annotations": { - "list": [ - { - "builtIn": 1, - "datasource": "-- Grafana --", - "enable": true, - "hide": true, - "iconColor": "rgba(0, 211, 255, 1)", - "name": "Annotations & Alerts", - "type": "dashboard" - } - ] - }, - "description": "{{TITLE}}", - "editable": true, - "gnetId": null, - "graphTooltip": 0, - "id": {{ ID }}, - "iteration": 1625757047565, - "links": [], - "panels": [ -{% for panel in PANELS -%} -{%- import_json "grafana/panels/" ~ panel ~ ".json.jinja" as panel %} -{{ panel | json }} {% if not loop.last %},{% endif %} -{% endfor -%} - ], - "refresh": "5m", - "schemaVersion": 27, - "style": "dark", - "tags": [], - "templating": { - "list": [ -{% for template in TEMPLATES.keys() -%} -{%- import_json "grafana/templates/" ~ template ~ ".json" as template %} -{{ template | json }} {% if not loop.last %},{% endif %} -{% endfor -%} - ] - }, - "time": { - "from": "now-3h", - "to": "now" - }, - "timepicker": { - "refresh_intervals": [ - "30s", - "1m", - "5m", - "15m", - "30m", - "1h", - "2h", - "1d" - ] - }, - "timezone": "browser", - "title": "{{ TITLE }}", - {% if TITLE | lower == 'security onion grid overview' %} - "uid": "so_overview", - {% else %} - "uid": "{{ UID }}", - {% endif %} - "version": 1 -} diff --git a/salt/grafana/etc/dashboards/dashboard.yml b/salt/grafana/etc/dashboards/dashboard.yml deleted file mode 100644 index 2c422069c..000000000 --- a/salt/grafana/etc/dashboards/dashboard.yml +++ /dev/null @@ -1,12 +0,0 @@ -apiVersion: 1 - -providers: -- name: 'Dashboards' - folder: 'Dashboards' - type: file - disableDeletion: false - editable: true - allowUiUpdates: true - options: - path: /etc/grafana/grafana_dashboards/ - diff --git a/salt/grafana/etc/datasources/influxdb.yaml b/salt/grafana/etc/datasources/influxdb.yaml deleted file mode 100644 index 1c4fd8135..000000000 --- a/salt/grafana/etc/datasources/influxdb.yaml +++ /dev/null @@ -1,17 +0,0 @@ -apiVersion: 1 - -deleteDatasources: - - name: Graphite - orgId: 1 - -datasources: - - name: InfluxDB - type: influxdb - access: proxy - database: telegraf - url: https://{{ GLOBALS.influxdb_host }}:8086 - jsonData: - tlsAuth: false - tlsAuthWithCACert: false - tlsSkipVerify: true - version: 1 diff --git a/salt/grafana/etc/files/readme.txt b/salt/grafana/etc/files/readme.txt deleted file mode 100644 index c78e8687c..000000000 --- a/salt/grafana/etc/files/readme.txt +++ /dev/null @@ -1 +0,0 @@ -For files that are referenced inside the Grafana config, place them in /opt/so/saltstack/local/salt/grafana/etc/files/. This would include keys used for smtp or a Grafana enterprise license file. \ No newline at end of file diff --git a/salt/grafana/etc/grafana.ini.jinja b/salt/grafana/etc/grafana.ini.jinja deleted file mode 100644 index f2309056d..000000000 --- a/salt/grafana/etc/grafana.ini.jinja +++ /dev/null @@ -1,12 +0,0 @@ -{%- macro write_config_line(cfg) %} -{%- for k,v in cfg.items() -%} -{{ k }} = {{ v }} -{% endfor %} -{%- endmacro %} - -{{ write_config_line(config.get("default", {})) }} -{% for header, cfg in config.items() %} -{%- if header == "default" %}{% continue %}{% endif %} -[{{ header }}] -{{ write_config_line(cfg) }} -{% endfor %} \ No newline at end of file diff --git a/salt/grafana/grafana_defaults.yaml b/salt/grafana/grafana_defaults.yaml deleted file mode 100644 index b05775886..000000000 --- a/salt/grafana/grafana_defaults.yaml +++ /dev/null @@ -1,3147 +0,0 @@ -grafana: - config: - server: - root_url: "%(protocol)s://%(domain)s/grafana/" - auth.anonymous: - enabled: true - org_name: Main Org. - org_role: Viewer - smtp: - enabled: false - host: localhost:25 - user: myuser - password: mypassword - cert_file: /etc/grafana/config/files/smtp_cert_file.crt - key_file: /etc/grafana/config/files/smtp_key_file.key - skip_verify: false - from_address: admin@grafana.localhost - from_name: Grafana - ehlo_identity: dashboard.example.com - auth.ldap: - enabled: false - config_file: /etc/grafana/config/files/ldap.toml - allow_sign_up: true - enterprise: - license_path: /opt/so/conf/grafana/etc/files/license.jwt - dashboards: - overview: - title: 'Security Onion Grid Overview' - templating: - list: - servername: - text: All - value: "$__all" - role: - allValue: true - multi: true - hide: 0 - text: All - value: "$__all" - containers: {} - manint: {} - monint: {} - cpucount: {} - disk: {} - panels: - row_overview: - gridPos: - x: 0 - y: 0 - h: 1 - w: 24 - system_uptime_graph: - gridPos: - x: 0 - y: 1 - h: 8 - w: 12 - uptime_docker_combined_current_graph: - gridPos: - x: 12 - y: 1 - h: 8 - w: 12 - cpu_usage_current_graph: - gridPos: - x: 0 - y: 9 - h: 8 - w: 24 - memory_usage_percent_graph: - gridPos: - x: 0 - y: 17 - h: 8 - w: 24 - disk_usage_root_percent_graph: - gridPos: - x: 0 - y: 25 - h: 8 - w: 24 - disk_usage_nsm_percent_graph: - gridPos: - x: 0 - y: 33 - h: 8 - w: 24 - swap_usage_percent_graph: - gridPos: - x: 0 - y: 41 - h: 8 - w: 24 - io_wait_graph: - gridPos: - x: 0 - y: 49 - h: 8 - w: 24 - - row_network: - gridPos: - x: 0 - y: 57 - h: 1 - w: 24 - management_interface_traffic_inbound_graph: - gridPos: - x: 0 - y: 58 - h: 8 - w: 24 - management_interface_traffic_outbound_graph: - gridPos: - x: 0 - y: 64 - h: 8 - w: 24 - management_interface_drops_inbound_graph: - gridPos: - x: 0 - y: 72 - h: 8 - w: 24 - management_interface_drops_outbound_graph: - gridPos: - x: 0 - y: 80 - h: 8 - w: 24 - monitor_interface_traffic_inbound_graph: - gridPos: - x: 0 - y: 88 - h: 8 - w: 24 - monitor_interface_drops_inbound_graph: - gridPos: - x: 0 - y: 96 - h: 8 - w: 24 - - row_packet_loss: - gridPos: - x: 0 - y: 104 - h: 1 - w: 24 - zeek_packet_loss_graph: - gridPos: - x: 0 - y: 105 - h: 8 - w: 24 - hideTrend: true - suricata_packet_loss_graph: - gridPos: - x: 0 - y: 113 - h: 8 - w: 24 - hideTrend: true - stenographer_packet_loss_graph: - gridPos: - x: 0 - y: 121 - h: 8 - w: 24 - hideTrend: true - - row_cpu: - gridPos: - x: 0 - y: 999 - h: 1 - w: 24 - cpu_usage_tasks_running_graph: - gridPos: - x: 0 - y: 1000 - h: 8 - w: 24 - cpu_usage_tasks_zombies_graph: - gridPos: - x: 0 - y: 1008 - h: 8 - w: 12 - cpu_usage_tasks_stopped_graph: - gridPos: - x: 12 - y: 1008 - h: 8 - w: 12 - cpu_usage_tasks_sleeping_graph: - gridPos: - x: 0 - y: 1016 - h: 8 - w: 12 - cpu_usage_tasks_blocked_graph: - gridPos: - x: 12 - y: 1016 - h: 8 - w: 12 - cpu_usage_tasks_paging_graph: - gridPos: - x: 0 - y: 1024 - h: 8 - w: 12 - cpu_usage_tasks_unknown_graph: - gridPos: - x: 12 - y: 1024 - h: 8 - w: 12 - - - standalone: - templating: - list: - servername: {} - role: - allValue: false - multi: false - hide: 2 - containers: {} - manint: {} - monint: {} - cpucount: {} - disk: {} - panels: - row_overview: - gridPos: - x: 0 - y: 0 - h: 1 - w: 24 - system_uptime: - gridPos: - x: 0 - y: 1 - h: 4 - w: 4 - load_average_5_minute_stat: - gridPos: - x: 4 - y: 1 - h: 4 - w: 4 - cpu_usage_guage: - gridPos: - x: 8 - y: 1 - h: 4 - w: 2 - ram_usage_guage: - gridPos: - x: 10 - y: 1 - h: 4 - w: 2 - swap_usage_guage: - gridPos: - x: 12 - y: 1 - h: 4 - w: 2 - rootfs_used_guage: - gridPos: - x: 14 - y: 1 - h: 4 - w: 2 - nsm_used_guage: - gridPos: - x: 16 - y: 1 - h: 4 - w: 2 - pcap_retention_stat: - gridPos: - x: 18 - y: 1 - h: 4 - w: 2 - io_wait_stat: - gridPos: - x: 20 - y: 1 - h: 4 - w: 4 - logstash_estimated_eps_in_stat: - gridPos: - x: 0 - y: 5 - h: 4 - w: 4 - redis_queue_stat: - gridPos: - x: 4 - y: 5 - h: 4 - w: 4 - monitor_interface_traffic_stat: - gridPos: - x: 8 - y: 5 - h: 4 - w: 4 - zeek_packet_loss_stat: - gridPos: - x: 12 - y: 5 - h: 4 - w: 4 - suricata_packet_loss_stat: - gridPos: - x: 16 - y: 5 - h: 4 - w: 4 - stenographer_packet_loss_stat: - gridPos: - x: 20 - y: 5 - h: 4 - w: 4 - - row_cpu: - gridPos: - x: 0 - y: 9 - h: 1 - w: 24 - cpu_usage_tasks_all_graph: - gridPos: - x: 0 - y: 10 - h: 8 - w: 24 - load_averages_graph: - gridPos: - x: 0 - y: 18 - h: 8 - w: 12 - process_status_graph: - gridPos: - x: 12 - y: 18 - h: 8 - w: 12 - - row_memory: - gridPos: - x: 0 - y: 26 - h: 1 - w: 24 - memory_usage_graph: - gridPos: - x: 0 - y: 27 - h: 8 - w: 24 - - row_swap: - gridPos: - x: 0 - y: 35 - h: 1 - w: 24 - swap_io_bytes_graph: - gridPos: - x: 0 - y: 36 - h: 8 - w: 12 - swap_usage_bytes_graph: - gridPos: - x: 12 - y: 36 - h: 8 - w: 12 - - row_network: - gridPos: - x: 0 - y: 44 - h: 1 - w: 24 - management_interface_traffic_both_graph: - gridPos: - x: 0 - y: 45 - h: 8 - w: 24 - management_interface_packets_graph: - gridPos: - x: 0 - y: 53 - h: 8 - w: 12 - management_interface_drops_graph: - gridPos: - x: 12 - y: 53 - h: 8 - w: 12 - monitor_interface_traffic_both_graph: - gridPos: - x: 0 - y: 61 - h: 8 - w: 24 - monitor_interface_packets_graph: - gridPos: - x: 0 - y: 69 - h: 8 - w: 12 - monitor_interface_drops_graph: - gridPos: - x: 12 - y: 69 - h: 8 - w: 12 - - row_disk_usage: - gridPos: - x: 0 - y: 77 - h: 1 - w: 24 - disk_usage_root_graph: - gridPos: - x: 0 - y: 78 - h: 8 - w: 12 - disk_usage_nsm_graph: - gridPos: - x: 12 - y: 78 - h: 8 - w: 12 - - row_disk_iops: - gridPos: - x: 0 - y: 86 - h: 1 - w: 24 - disk_io_requests_graph: - gridPos: - x: 0 - y: 87 - h: 8 - w: 8 - disk_io_bytes_graph: - gridPos: - x: 8 - y: 87 - h: 8 - w: 8 - disk_io_time_graph: - gridPos: - x: 16 - y: 87 - h: 8 - w: 8 - - row_docker_details: - gridPos: - x: 0 - y: 95 - h: 1 - w: 24 - cpu_docker_combined_current_graph: - gridPos: - x: 0 - y: 96 - h: 8 - w: 24 - cpu_docker_combined_trend_graph: - gridPos: - x: 0 - y: 104 - h: 8 - w: 24 - memory_used_docker_combined_current_graph: - gridPos: - x: 0 - y: 112 - h: 8 - w: 24 - memory_used_docker_combined_trend_graph: - gridPos: - x: 0 - y: 120 - h: 8 - w: 24 - network_usage_docker_combined_current_graph: - gridPos: - x: 0 - y: 128 - h: 8 - w: 24 - network_usage_docker_combined_trend_graph: - gridPos: - x: 0 - y: 136 - h: 8 - w: 24 - uptime_docker_combined_current_graph: - gridPos: - x: 0 - y: 144 - h: 8 - w: 12 - uptime_docker_combined_trend_graph: - gridPos: - x: 12 - y: 144 - h: 8 - w: 12 - - row_logstash: - gridPos: - x: 0 - y: 152 - h: 1 - w: 24 - logstash_estimated_eps_in_graph: - gridPos: - x: 0 - y: 153 - h: 8 - w: 24 - - row_elasticsearch: - gridPos: - x: 0 - y: 161 - h: 1 - w: 24 - elasticsearch_document_count_graph: - gridPos: - x: 0 - y: 162 - h: 8 - w: 12 - elasticsearch_thread_count_graph: - gridPos: - x: 12 - y: 162 - h: 8 - w: 12 - elasticsearch_store_size_graph: - gridPos: - x: 0 - y: 170 - h: 8 - w: 12 - elasticsearch_field_data_cache_size_graph: - gridPos: - x: 12 - y: 170 - h: 8 - w: 12 - - row_redis: - gridPos: - x: 0 - y: 178 - h: 1 - w: 24 - redis_queue_graph: - gridPos: - x: 0 - y: 179 - h: 8 - w: 24 - - row_zeek: - gridPos: - x: 0 - y: 187 - h: 1 - w: 24 - zeek_packet_loss_graph: - gridPos: - x: 0 - y: 188 - h: 8 - w: 12 - zeek_capture_loss_graph: - gridPos: - x: 12 - y: 188 - h: 8 - w: 12 - - row_suricata: - gridPos: - x: 0 - y: 196 - h: 1 - w: 24 - suricata_packet_loss_graph: - gridPos: - x: 0 - y: 197 - h: 8 - w: 24 - - row_stenographer: - gridPos: - x: 0 - y: 205 - h: 1 - w: 24 - stenographer_packet_loss_graph: - gridPos: - x: 0 - y: 206 - h: 8 - w: 16 - stenographer_pcap_retention_graph: - gridPos: - x: 16 - y: 206 - h: 8 - w: 8 - - row_influxdb: - gridPos: - x: 0 - y: 214 - h: 1 - w: 24 - influxdb_db_size_graph: - gridPos: - x: 0 - y: 214 - h: 8 - w: 24 - - - manager: - templating: - list: - servername: {} - role: - allValue: false - multi: false - hide: 2 - containers: {} - manint: {} - monint: {} - cpucount: {} - disk: {} - panels: - row_overview: - gridPos: - x: 0 - y: 0 - h: 1 - w: 24 - system_uptime: - gridPos: - x: 0 - y: 1 - h: 4 - w: 4 - load_average_5_minute_stat: - gridPos: - x: 4 - y: 1 - h: 4 - w: 4 - cpu_usage_guage: - gridPos: - x: 8 - y: 1 - h: 4 - w: 2 - ram_usage_guage: - gridPos: - x: 10 - y: 1 - h: 4 - w: 2 - swap_usage_guage: - gridPos: - x: 12 - y: 1 - h: 4 - w: 2 - rootfs_used_guage: - gridPos: - x: 14 - y: 1 - h: 4 - w: 2 - nsm_used_guage: - gridPos: - x: 16 - y: 1 - h: 4 - w: 2 - io_wait_stat: - gridPos: - x: 20 - y: 1 - h: 4 - w: 4 - redis_queue_stat: - gridPos: - x: 0 - y: 5 - h: 4 - w: 4 - - row_cpu: - gridPos: - x: 0 - y: 9 - h: 1 - w: 24 - cpu_usage_tasks_all_graph: - gridPos: - x: 0 - y: 10 - h: 8 - w: 24 - load_averages_graph: - gridPos: - x: 0 - y: 18 - h: 8 - w: 12 - process_status_graph: - gridPos: - x: 12 - y: 18 - h: 8 - w: 12 - - row_memory: - gridPos: - x: 0 - y: 26 - h: 1 - w: 24 - memory_usage_graph: - gridPos: - x: 0 - y: 27 - h: 8 - w: 24 - - row_swap: - gridPos: - x: 0 - y: 35 - h: 1 - w: 24 - swap_io_bytes_graph: - gridPos: - x: 0 - y: 36 - h: 8 - w: 12 - swap_usage_bytes_graph: - gridPos: - x: 12 - y: 36 - h: 8 - w: 12 - - row_network: - gridPos: - x: 0 - y: 44 - h: 1 - w: 24 - management_interface_traffic_both_graph: - gridPos: - x: 0 - y: 45 - h: 8 - w: 24 - management_interface_packets_graph: - gridPos: - x: 0 - y: 53 - h: 8 - w: 12 - management_interface_drops_graph: - gridPos: - x: 12 - y: 53 - h: 8 - w: 12 - - row_disk_usage: - gridPos: - x: 0 - y: 77 - h: 1 - w: 24 - disk_usage_root_graph: - gridPos: - x: 0 - y: 78 - h: 8 - w: 12 - disk_usage_nsm_graph: - gridPos: - x: 12 - y: 78 - h: 8 - w: 12 - - row_disk_iops: - gridPos: - x: 0 - y: 86 - h: 1 - w: 24 - disk_io_requests_graph: - gridPos: - x: 0 - y: 87 - h: 8 - w: 8 - disk_io_bytes_graph: - gridPos: - x: 8 - y: 87 - h: 8 - w: 8 - disk_io_time_graph: - gridPos: - x: 16 - y: 87 - h: 8 - w: 8 - - row_docker_details: - gridPos: - x: 0 - y: 95 - h: 1 - w: 24 - cpu_docker_combined_current_graph: - gridPos: - x: 0 - y: 96 - h: 8 - w: 24 - cpu_docker_combined_trend_graph: - gridPos: - x: 0 - y: 104 - h: 8 - w: 24 - memory_used_docker_combined_current_graph: - gridPos: - x: 0 - y: 112 - h: 8 - w: 24 - memory_used_docker_combined_trend_graph: - gridPos: - x: 0 - y: 120 - h: 8 - w: 24 - network_usage_docker_combined_current_graph: - gridPos: - x: 0 - y: 128 - h: 8 - w: 24 - network_usage_docker_combined_trend_graph: - gridPos: - x: 0 - y: 136 - h: 8 - w: 24 - uptime_docker_combined_current_graph: - gridPos: - x: 0 - y: 144 - h: 8 - w: 12 - uptime_docker_combined_trend_graph: - gridPos: - x: 12 - y: 144 - h: 8 - w: 12 - - row_elasticsearch: - gridPos: - x: 0 - y: 152 - h: 1 - w: 24 - elasticsearch_document_count_graph: - gridPos: - x: 0 - y: 153 - h: 8 - w: 12 - elasticsearch_thread_count_graph: - gridPos: - x: 12 - y: 153 - h: 8 - w: 12 - elasticsearch_store_size_graph: - gridPos: - x: 0 - y: 161 - h: 8 - w: 12 - elasticsearch_field_data_cache_size_graph: - gridPos: - x: 12 - y: 161 - h: 8 - w: 12 - - row_redis: - gridPos: - x: 0 - y: 169 - h: 1 - w: 24 - redis_queue_graph: - gridPos: - x: 0 - y: 170 - h: 8 - w: 24 - - row_influxdb: - gridPos: - x: 0 - y: 178 - h: 1 - w: 24 - influxdb_db_size_graph: - gridPos: - x: 0 - y: 179 - h: 8 - w: 24 - - - managersearch: - templating: - list: - servername: {} - role: - allValue: false - multi: false - hide: 2 - containers: {} - manint: {} - monint: {} - cpucount: {} - disk: {} - panels: - row_overview: - gridPos: - x: 0 - y: 0 - h: 1 - w: 24 - system_uptime: - gridPos: - x: 0 - y: 1 - h: 4 - w: 4 - load_average_5_minute_stat: - gridPos: - x: 4 - y: 1 - h: 4 - w: 4 - cpu_usage_guage: - gridPos: - x: 8 - y: 1 - h: 4 - w: 2 - ram_usage_guage: - gridPos: - x: 10 - y: 1 - h: 4 - w: 2 - swap_usage_guage: - gridPos: - x: 12 - y: 1 - h: 4 - w: 2 - rootfs_used_guage: - gridPos: - x: 14 - y: 1 - h: 4 - w: 2 - nsm_used_guage: - gridPos: - x: 16 - y: 1 - h: 4 - w: 2 - io_wait_stat: - gridPos: - x: 20 - y: 1 - h: 4 - w: 4 - logstash_estimated_eps_in_stat: - gridPos: - x: 0 - y: 5 - h: 4 - w: 4 - redis_queue_stat: - gridPos: - x: 4 - y: 5 - h: 4 - w: 4 - - row_cpu: - gridPos: - x: 0 - y: 9 - h: 1 - w: 24 - cpu_usage_tasks_all_graph: - gridPos: - x: 0 - y: 10 - h: 8 - w: 24 - load_averages_graph: - gridPos: - x: 0 - y: 18 - h: 8 - w: 12 - process_status_graph: - gridPos: - x: 12 - y: 18 - h: 8 - w: 12 - - row_memory: - gridPos: - x: 0 - y: 26 - h: 1 - w: 24 - memory_usage_graph: - gridPos: - x: 0 - y: 27 - h: 8 - w: 24 - - row_swap: - gridPos: - x: 0 - y: 35 - h: 1 - w: 24 - swap_io_bytes_graph: - gridPos: - x: 0 - y: 36 - h: 8 - w: 12 - swap_usage_bytes_graph: - gridPos: - x: 12 - y: 36 - h: 8 - w: 12 - - row_network: - gridPos: - x: 0 - y: 44 - h: 1 - w: 24 - management_interface_traffic_both_graph: - gridPos: - x: 0 - y: 45 - h: 8 - w: 24 - management_interface_packets_graph: - gridPos: - x: 0 - y: 53 - h: 8 - w: 12 - management_interface_drops_graph: - gridPos: - x: 12 - y: 53 - h: 8 - w: 12 - - row_disk_usage: - gridPos: - x: 0 - y: 77 - h: 1 - w: 24 - disk_usage_root_graph: - gridPos: - x: 0 - y: 78 - h: 8 - w: 12 - disk_usage_nsm_graph: - gridPos: - x: 12 - y: 78 - h: 8 - w: 12 - - row_disk_iops: - gridPos: - x: 0 - y: 86 - h: 1 - w: 24 - disk_io_requests_graph: - gridPos: - x: 0 - y: 87 - h: 8 - w: 8 - disk_io_bytes_graph: - gridPos: - x: 8 - y: 87 - h: 8 - w: 8 - disk_io_time_graph: - gridPos: - x: 16 - y: 87 - h: 8 - w: 8 - - row_docker_details: - gridPos: - x: 0 - y: 95 - h: 1 - w: 24 - cpu_docker_combined_current_graph: - gridPos: - x: 0 - y: 96 - h: 8 - w: 24 - cpu_docker_combined_trend_graph: - gridPos: - x: 0 - y: 104 - h: 8 - w: 24 - memory_used_docker_combined_current_graph: - gridPos: - x: 0 - y: 112 - h: 8 - w: 24 - memory_used_docker_combined_trend_graph: - gridPos: - x: 0 - y: 120 - h: 8 - w: 24 - network_usage_docker_combined_current_graph: - gridPos: - x: 0 - y: 128 - h: 8 - w: 24 - network_usage_docker_combined_trend_graph: - gridPos: - x: 0 - y: 136 - h: 8 - w: 24 - uptime_docker_combined_current_graph: - gridPos: - x: 0 - y: 144 - h: 8 - w: 12 - uptime_docker_combined_trend_graph: - gridPos: - x: 12 - y: 144 - h: 8 - w: 12 - - row_logstash: - gridPos: - x: 0 - y: 152 - h: 1 - w: 24 - logstash_estimated_eps_in_graph: - gridPos: - x: 0 - y: 153 - h: 8 - w: 24 - - row_elasticsearch: - gridPos: - x: 0 - y: 161 - h: 1 - w: 24 - elasticsearch_document_count_graph: - gridPos: - x: 0 - y: 162 - h: 8 - w: 12 - elasticsearch_thread_count_graph: - gridPos: - x: 12 - y: 162 - h: 8 - w: 12 - elasticsearch_store_size_graph: - gridPos: - x: 0 - y: 170 - h: 8 - w: 12 - elasticsearch_field_data_cache_size_graph: - gridPos: - x: 12 - y: 170 - h: 8 - w: 12 - - row_redis: - gridPos: - x: 0 - y: 178 - h: 1 - w: 24 - redis_queue_graph: - gridPos: - x: 0 - y: 179 - h: 8 - w: 24 - - row_influxdb: - gridPos: - x: 0 - y: 214 - h: 1 - w: 24 - influxdb_db_size_graph: - gridPos: - x: 0 - y: 214 - h: 8 - w: 24 - - - sensor: - templating: - list: - servername: {} - role: - allValue: false - multi: false - hide: 2 - containers: {} - manint: {} - monint: {} - cpucount: {} - disk: {} - panels: - row_overview: - gridPos: - x: 0 - y: 0 - h: 1 - w: 24 - system_uptime: - gridPos: - x: 0 - y: 1 - h: 4 - w: 4 - load_average_5_minute_stat: - gridPos: - x: 4 - y: 1 - h: 4 - w: 4 - cpu_usage_guage: - gridPos: - x: 8 - y: 1 - h: 4 - w: 2 - ram_usage_guage: - gridPos: - x: 10 - y: 1 - h: 4 - w: 2 - swap_usage_guage: - gridPos: - x: 12 - y: 1 - h: 4 - w: 2 - rootfs_used_guage: - gridPos: - x: 14 - y: 1 - h: 4 - w: 2 - nsm_used_guage: - gridPos: - x: 16 - y: 1 - h: 4 - w: 2 - pcap_retention_stat: - gridPos: - x: 18 - y: 1 - h: 4 - w: 2 - io_wait_stat: - gridPos: - x: 20 - y: 1 - h: 4 - w: 4 - monitor_interface_traffic_stat: - gridPos: - x: 8 - y: 5 - h: 4 - w: 4 - zeek_packet_loss_stat: - gridPos: - x: 12 - y: 5 - h: 4 - w: 4 - suricata_packet_loss_stat: - gridPos: - x: 16 - y: 5 - h: 4 - w: 4 - stenographer_packet_loss_stat: - gridPos: - x: 20 - y: 5 - h: 4 - w: 4 - - row_cpu: - gridPos: - x: 0 - y: 9 - h: 1 - w: 24 - cpu_usage_tasks_all_graph: - gridPos: - x: 0 - y: 10 - h: 8 - w: 24 - load_averages_graph: - gridPos: - x: 0 - y: 18 - h: 8 - w: 12 - process_status_graph: - gridPos: - x: 12 - y: 18 - h: 8 - w: 12 - - row_memory: - gridPos: - x: 0 - y: 26 - h: 1 - w: 24 - memory_usage_graph: - gridPos: - x: 0 - y: 27 - h: 8 - w: 24 - - row_swap: - gridPos: - x: 0 - y: 35 - h: 1 - w: 24 - swap_io_bytes_graph: - gridPos: - x: 0 - y: 36 - h: 8 - w: 12 - swap_usage_bytes_graph: - gridPos: - x: 12 - y: 36 - h: 8 - w: 12 - - row_network: - gridPos: - x: 0 - y: 44 - h: 1 - w: 24 - management_interface_traffic_both_graph: - gridPos: - x: 0 - y: 45 - h: 8 - w: 24 - management_interface_packets_graph: - gridPos: - x: 0 - y: 53 - h: 8 - w: 12 - management_interface_drops_graph: - gridPos: - x: 12 - y: 53 - h: 8 - w: 12 - monitor_interface_traffic_both_graph: - gridPos: - x: 0 - y: 61 - h: 8 - w: 24 - monitor_interface_traffic_inbound_total_graph: - gridPos: - x: 0 - y: 69 - h: 8 - w: 24 - monitor_interface_packets_graph: - gridPos: - x: 0 - y: 77 - h: 8 - w: 12 - monitor_interface_drops_graph: - gridPos: - x: 12 - y: 77 - h: 8 - w: 12 - - row_disk_usage: - gridPos: - x: 0 - y: 85 - h: 1 - w: 24 - disk_usage_root_graph: - gridPos: - x: 0 - y: 86 - h: 8 - w: 12 - disk_usage_nsm_graph: - gridPos: - x: 12 - y: 86 - h: 8 - w: 12 - - row_disk_iops: - gridPos: - x: 0 - y: 94 - h: 1 - w: 24 - disk_io_requests_graph: - gridPos: - x: 0 - y: 95 - h: 8 - w: 8 - disk_io_bytes_graph: - gridPos: - x: 8 - y: 95 - h: 8 - w: 8 - disk_io_time_graph: - gridPos: - x: 16 - y: 95 - h: 8 - w: 8 - - row_docker_details: - gridPos: - x: 0 - y: 103 - h: 1 - w: 24 - cpu_docker_combined_current_graph: - gridPos: - x: 0 - y: 104 - h: 8 - w: 24 - cpu_docker_combined_trend_graph: - gridPos: - x: 0 - y: 112 - h: 8 - w: 24 - memory_used_docker_combined_current_graph: - gridPos: - x: 0 - y: 120 - h: 8 - w: 24 - memory_used_docker_combined_trend_graph: - gridPos: - x: 0 - y: 128 - h: 8 - w: 24 - network_usage_docker_combined_current_graph: - gridPos: - x: 0 - y: 136 - h: 8 - w: 24 - network_usage_docker_combined_trend_graph: - gridPos: - x: 0 - y: 144 - h: 8 - w: 24 - uptime_docker_combined_current_graph: - gridPos: - x: 0 - y: 152 - h: 8 - w: 12 - uptime_docker_combined_trend_graph: - gridPos: - x: 12 - y: 152 - h: 8 - w: 12 - - row_zeek: - gridPos: - x: 0 - y: 160 - h: 1 - w: 24 - zeek_packet_loss_graph: - gridPos: - x: 0 - y: 161 - h: 8 - w: 12 - zeek_capture_loss_graph: - gridPos: - x: 12 - y: 161 - h: 8 - w: 12 - - row_suricata: - gridPos: - x: 0 - y: 169 - h: 1 - w: 24 - suricata_packet_loss_graph: - gridPos: - x: 0 - y: 170 - h: 8 - w: 24 - - row_stenographer: - gridPos: - x: 0 - y: 178 - h: 1 - w: 24 - stenographer_packet_loss_graph: - gridPos: - x: 0 - y: 179 - h: 8 - w: 16 - stenographer_pcap_retention_graph: - gridPos: - x: 16 - y: 179 - h: 8 - w: 8 - - - searchnode: - templating: - list: - servername: {} - role: - allValue: false - multi: false - hide: 2 - containers: {} - manint: {} - monint: {} - cpucount: {} - disk: {} - panels: - row_overview: - gridPos: - x: 0 - y: 0 - h: 1 - w: 24 - system_uptime: - gridPos: - x: 0 - y: 1 - h: 4 - w: 4 - load_average_5_minute_stat: - gridPos: - x: 4 - y: 1 - h: 4 - w: 4 - cpu_usage_guage: - gridPos: - x: 8 - y: 1 - h: 4 - w: 2 - ram_usage_guage: - gridPos: - x: 10 - y: 1 - h: 4 - w: 2 - swap_usage_guage: - gridPos: - x: 12 - y: 1 - h: 4 - w: 2 - rootfs_used_guage: - gridPos: - x: 14 - y: 1 - h: 4 - w: 2 - nsm_used_guage: - gridPos: - x: 16 - y: 1 - h: 4 - w: 2 - io_wait_stat: - gridPos: - x: 20 - y: 1 - h: 4 - w: 4 - logstash_estimated_eps_in_stat: - gridPos: - x: 0 - y: 5 - h: 4 - w: 4 - logstash_estimated_eps_out_stat: - gridPos: - x: 4 - y: 5 - h: 4 - w: 4 - - row_cpu: - gridPos: - x: 0 - y: 9 - h: 1 - w: 24 - cpu_usage_tasks_all_graph: - gridPos: - x: 0 - y: 10 - h: 8 - w: 24 - load_averages_graph: - gridPos: - x: 0 - y: 18 - h: 8 - w: 12 - process_status_graph: - gridPos: - x: 12 - y: 18 - h: 8 - w: 12 - - row_memory: - gridPos: - x: 0 - y: 26 - h: 1 - w: 24 - memory_usage_graph: - gridPos: - x: 0 - y: 27 - h: 8 - w: 24 - - row_swap: - gridPos: - x: 0 - y: 35 - h: 1 - w: 24 - swap_io_bytes_graph: - gridPos: - x: 0 - y: 36 - h: 8 - w: 12 - swap_usage_bytes_graph: - gridPos: - x: 12 - y: 36 - h: 8 - w: 12 - - row_network: - gridPos: - x: 0 - y: 44 - h: 1 - w: 24 - management_interface_traffic_both_graph: - gridPos: - x: 0 - y: 45 - h: 8 - w: 24 - management_interface_packets_graph: - gridPos: - x: 0 - y: 53 - h: 8 - w: 12 - management_interface_drops_graph: - gridPos: - x: 12 - y: 53 - h: 8 - w: 12 - - row_disk_usage: - gridPos: - x: 0 - y: 77 - h: 1 - w: 24 - disk_usage_root_graph: - gridPos: - x: 0 - y: 78 - h: 8 - w: 12 - disk_usage_nsm_graph: - gridPos: - x: 12 - y: 78 - h: 8 - w: 12 - - row_disk_iops: - gridPos: - x: 0 - y: 86 - h: 1 - w: 24 - disk_io_requests_graph: - gridPos: - x: 0 - y: 87 - h: 8 - w: 8 - disk_io_bytes_graph: - gridPos: - x: 8 - y: 87 - h: 8 - w: 8 - disk_io_time_graph: - gridPos: - x: 16 - y: 87 - h: 8 - w: 8 - - row_docker_details: - gridPos: - x: 0 - y: 95 - h: 1 - w: 24 - cpu_docker_combined_current_graph: - gridPos: - x: 0 - y: 96 - h: 8 - w: 24 - cpu_docker_combined_trend_graph: - gridPos: - x: 0 - y: 104 - h: 8 - w: 24 - memory_used_docker_combined_current_graph: - gridPos: - x: 0 - y: 112 - h: 8 - w: 24 - memory_used_docker_combined_trend_graph: - gridPos: - x: 0 - y: 120 - h: 8 - w: 24 - network_usage_docker_combined_current_graph: - gridPos: - x: 0 - y: 128 - h: 8 - w: 24 - network_usage_docker_combined_trend_graph: - gridPos: - x: 0 - y: 136 - h: 8 - w: 24 - uptime_docker_combined_current_graph: - gridPos: - x: 0 - y: 144 - h: 8 - w: 12 - uptime_docker_combined_trend_graph: - gridPos: - x: 12 - y: 144 - h: 8 - w: 12 - - row_logstash: - gridPos: - x: 0 - y: 152 - h: 1 - w: 24 - logstash_estimated_eps_in_graph: - gridPos: - x: 0 - y: 153 - h: 8 - w: 24 - logstash_estimated_eps_in_total_graph: - gridPos: - x: 0 - y: 161 - h: 8 - w: 24 - logstash_estimated_eps_out_graph: - gridPos: - x: 0 - y: 169 - h: 8 - w: 24 - logstash_estimated_eps_out_total_graph: - gridPos: - x: 0 - y: 172 - h: 8 - w: 24 - - - heavynode: - templating: - list: - servername: {} - role: - allValue: false - multi: false - hide: 2 - containers: {} - manint: {} - monint: {} - cpucount: {} - disk: {} - panels: - row_overview: - gridPos: - x: 0 - y: 0 - h: 1 - w: 24 - system_uptime: - gridPos: - x: 0 - y: 1 - h: 4 - w: 4 - load_average_5_minute_stat: - gridPos: - x: 4 - y: 1 - h: 4 - w: 4 - cpu_usage_guage: - gridPos: - x: 8 - y: 1 - h: 4 - w: 2 - ram_usage_guage: - gridPos: - x: 10 - y: 1 - h: 4 - w: 2 - swap_usage_guage: - gridPos: - x: 12 - y: 1 - h: 4 - w: 2 - rootfs_used_guage: - gridPos: - x: 14 - y: 1 - h: 4 - w: 2 - nsm_used_guage: - gridPos: - x: 16 - y: 1 - h: 4 - w: 2 - pcap_retention_stat: - gridPos: - x: 18 - y: 1 - h: 4 - w: 2 - io_wait_stat: - gridPos: - x: 20 - y: 1 - h: 4 - w: 4 - logstash_estimated_eps_in_stat: - gridPos: - x: 0 - y: 5 - h: 4 - w: 4 - monitor_interface_traffic_stat: - gridPos: - x: 4 - y: 5 - h: 4 - w: 4 - zeek_packet_loss_stat: - gridPos: - x: 8 - y: 5 - h: 4 - w: 4 - suricata_packet_loss_stat: - gridPos: - x: 12 - y: 5 - h: 4 - w: 4 - stenographer_packet_loss_stat: - gridPos: - x: 16 - y: 5 - h: 4 - w: 4 - - row_cpu: - gridPos: - x: 0 - y: 9 - h: 1 - w: 24 - cpu_usage_tasks_all_graph: - gridPos: - x: 0 - y: 10 - h: 8 - w: 24 - load_averages_graph: - gridPos: - x: 0 - y: 18 - h: 8 - w: 12 - process_status_graph: - gridPos: - x: 12 - y: 18 - h: 8 - w: 12 - - row_memory: - gridPos: - x: 0 - y: 26 - h: 1 - w: 24 - memory_usage_graph: - gridPos: - x: 0 - y: 27 - h: 8 - w: 24 - - row_swap: - gridPos: - x: 0 - y: 35 - h: 1 - w: 24 - swap_io_bytes_graph: - gridPos: - x: 0 - y: 36 - h: 8 - w: 12 - swap_usage_bytes_graph: - gridPos: - x: 12 - y: 36 - h: 8 - w: 12 - - row_network: - gridPos: - x: 0 - y: 44 - h: 1 - w: 24 - management_interface_traffic_both_graph: - gridPos: - x: 0 - y: 45 - h: 8 - w: 24 - management_interface_packets_graph: - gridPos: - x: 0 - y: 53 - h: 8 - w: 12 - management_interface_drops_graph: - gridPos: - x: 12 - y: 53 - h: 8 - w: 12 - monitor_interface_traffic_both_graph: - gridPos: - x: 0 - y: 61 - h: 8 - w: 24 - monitor_interface_packets_graph: - gridPos: - x: 0 - y: 69 - h: 8 - w: 12 - monitor_interface_drops_graph: - gridPos: - x: 12 - y: 69 - h: 8 - w: 12 - - row_disk_usage: - gridPos: - x: 0 - y: 77 - h: 1 - w: 24 - disk_usage_root_graph: - gridPos: - x: 0 - y: 78 - h: 8 - w: 12 - disk_usage_nsm_graph: - gridPos: - x: 12 - y: 78 - h: 8 - w: 12 - - row_disk_iops: - gridPos: - x: 0 - y: 86 - h: 1 - w: 24 - disk_io_requests_graph: - gridPos: - x: 0 - y: 87 - h: 8 - w: 8 - disk_io_bytes_graph: - gridPos: - x: 8 - y: 87 - h: 8 - w: 8 - disk_io_time_graph: - gridPos: - x: 16 - y: 87 - h: 8 - w: 8 - - row_docker_details: - gridPos: - x: 0 - y: 95 - h: 1 - w: 24 - cpu_docker_combined_current_graph: - gridPos: - x: 0 - y: 96 - h: 8 - w: 24 - cpu_docker_combined_trend_graph: - gridPos: - x: 0 - y: 104 - h: 8 - w: 24 - memory_used_docker_combined_current_graph: - gridPos: - x: 0 - y: 112 - h: 8 - w: 24 - memory_used_docker_combined_trend_graph: - gridPos: - x: 0 - y: 120 - h: 8 - w: 24 - network_usage_docker_combined_current_graph: - gridPos: - x: 0 - y: 128 - h: 8 - w: 24 - network_usage_docker_combined_trend_graph: - gridPos: - x: 0 - y: 136 - h: 8 - w: 24 - uptime_docker_combined_current_graph: - gridPos: - x: 0 - y: 144 - h: 8 - w: 12 - uptime_docker_combined_trend_graph: - gridPos: - x: 12 - y: 144 - h: 8 - w: 12 - - row_logstash: - gridPos: - x: 0 - y: 152 - h: 1 - w: 24 - logstash_estimated_eps_in_graph: - gridPos: - x: 0 - y: 153 - h: 8 - w: 24 - - row_zeek: - gridPos: - x: 0 - y: 170 - h: 1 - w: 24 - zeek_packet_loss_graph: - gridPos: - x: 0 - y: 171 - h: 8 - w: 12 - zeek_capture_loss_graph: - gridPos: - x: 12 - y: 171 - h: 8 - w: 12 - - row_suricata: - gridPos: - x: 0 - y: 179 - h: 1 - w: 24 - suricata_packet_loss_graph: - gridPos: - x: 0 - y: 180 - h: 8 - w: 24 - - row_stenographer: - gridPos: - x: 0 - y: 188 - h: 1 - w: 24 - stenographer_packet_loss_graph: - gridPos: - x: 0 - y: 189 - h: 8 - w: 16 - stenographer_pcap_retention_graph: - gridPos: - x: 16 - y: 189 - h: 8 - w: 8 - - - eval: - templating: - list: - servername: {} - role: - allValue: false - multi: false - hide: 2 - containers: {} - manint: {} - monint: {} - cpucount: {} - disk: {} - panels: - row_overview: - gridPos: - x: 0 - y: 0 - h: 1 - w: 24 - system_uptime: - gridPos: - x: 0 - y: 1 - h: 4 - w: 4 - load_average_5_minute_stat: - gridPos: - x: 4 - y: 1 - h: 4 - w: 4 - cpu_usage_guage: - gridPos: - x: 8 - y: 1 - h: 4 - w: 2 - ram_usage_guage: - gridPos: - x: 10 - y: 1 - h: 4 - w: 2 - swap_usage_guage: - gridPos: - x: 12 - y: 1 - h: 4 - w: 2 - rootfs_used_guage: - gridPos: - x: 14 - y: 1 - h: 4 - w: 2 - nsm_used_guage: - gridPos: - x: 16 - y: 1 - h: 4 - w: 2 - pcap_retention_stat: - gridPos: - x: 18 - y: 1 - h: 4 - w: 2 - io_wait_stat: - gridPos: - x: 20 - y: 1 - h: 4 - w: 4 - redis_queue_stat: - gridPos: - x: 4 - y: 5 - h: 4 - w: 4 - monitor_interface_traffic_stat: - gridPos: - x: 8 - y: 5 - h: 4 - w: 4 - zeek_packet_loss_stat: - gridPos: - x: 12 - y: 5 - h: 4 - w: 4 - suricata_packet_loss_stat: - gridPos: - x: 16 - y: 5 - h: 4 - w: 4 - stenographer_packet_loss_stat: - gridPos: - x: 20 - y: 5 - h: 4 - w: 4 - - row_cpu: - gridPos: - x: 0 - y: 9 - h: 1 - w: 24 - cpu_usage_tasks_all_graph: - gridPos: - x: 0 - y: 10 - h: 8 - w: 24 - load_averages_graph: - gridPos: - x: 0 - y: 18 - h: 8 - w: 12 - process_status_graph: - gridPos: - x: 12 - y: 18 - h: 8 - w: 12 - - row_memory: - gridPos: - x: 0 - y: 26 - h: 1 - w: 24 - memory_usage_graph: - gridPos: - x: 0 - y: 27 - h: 8 - w: 24 - - row_swap: - gridPos: - x: 0 - y: 35 - h: 1 - w: 24 - swap_io_bytes_graph: - gridPos: - x: 0 - y: 36 - h: 8 - w: 12 - swap_usage_bytes_graph: - gridPos: - x: 12 - y: 36 - h: 8 - w: 12 - - row_network: - gridPos: - x: 0 - y: 44 - h: 1 - w: 24 - management_interface_traffic_both_graph: - gridPos: - x: 0 - y: 45 - h: 8 - w: 24 - management_interface_packets_graph: - gridPos: - x: 0 - y: 53 - h: 8 - w: 12 - management_interface_drops_graph: - gridPos: - x: 12 - y: 53 - h: 8 - w: 12 - monitor_interface_traffic_both_graph: - gridPos: - x: 0 - y: 61 - h: 8 - w: 24 - monitor_interface_packets_graph: - gridPos: - x: 0 - y: 69 - h: 8 - w: 12 - monitor_interface_drops_graph: - gridPos: - x: 12 - y: 69 - h: 8 - w: 12 - - row_disk_usage: - gridPos: - x: 0 - y: 77 - h: 1 - w: 24 - disk_usage_root_graph: - gridPos: - x: 0 - y: 78 - h: 8 - w: 12 - disk_usage_nsm_graph: - gridPos: - x: 12 - y: 78 - h: 8 - w: 12 - - row_disk_iops: - gridPos: - x: 0 - y: 86 - h: 1 - w: 24 - disk_io_requests_graph: - gridPos: - x: 0 - y: 87 - h: 8 - w: 8 - disk_io_bytes_graph: - gridPos: - x: 8 - y: 87 - h: 8 - w: 8 - disk_io_time_graph: - gridPos: - x: 16 - y: 87 - h: 8 - w: 8 - - row_docker_details: - gridPos: - x: 0 - y: 95 - h: 1 - w: 24 - cpu_docker_combined_current_graph: - gridPos: - x: 0 - y: 96 - h: 8 - w: 24 - cpu_docker_combined_trend_graph: - gridPos: - x: 0 - y: 104 - h: 8 - w: 24 - memory_used_docker_combined_current_graph: - gridPos: - x: 0 - y: 112 - h: 8 - w: 24 - memory_used_docker_combined_trend_graph: - gridPos: - x: 0 - y: 120 - h: 8 - w: 24 - network_usage_docker_combined_current_graph: - gridPos: - x: 0 - y: 128 - h: 8 - w: 24 - network_usage_docker_combined_trend_graph: - gridPos: - x: 0 - y: 136 - h: 8 - w: 24 - uptime_docker_combined_current_graph: - gridPos: - x: 0 - y: 144 - h: 8 - w: 12 - uptime_docker_combined_trend_graph: - gridPos: - x: 12 - y: 144 - h: 8 - w: 12 - - row_elasticsearch: - gridPos: - x: 0 - y: 161 - h: 1 - w: 24 - elasticsearch_document_count_graph: - gridPos: - x: 0 - y: 162 - h: 8 - w: 12 - elasticsearch_thread_count_graph: - gridPos: - x: 12 - y: 162 - h: 8 - w: 12 - elasticsearch_store_size_graph: - gridPos: - x: 0 - y: 170 - h: 8 - w: 12 - elasticsearch_field_data_cache_size_graph: - gridPos: - x: 12 - y: 170 - h: 8 - w: 12 - - row_redis: - gridPos: - x: 0 - y: 178 - h: 1 - w: 24 - redis_queue_graph: - gridPos: - x: 0 - y: 179 - h: 8 - w: 24 - - row_zeek: - gridPos: - x: 0 - y: 187 - h: 1 - w: 24 - zeek_packet_loss_graph: - gridPos: - x: 0 - y: 188 - h: 8 - w: 12 - zeek_capture_loss_graph: - gridPos: - x: 12 - y: 188 - h: 8 - w: 12 - - row_suricata: - gridPos: - x: 0 - y: 196 - h: 1 - w: 24 - suricata_packet_loss_graph: - gridPos: - x: 0 - y: 197 - h: 8 - w: 24 - - row_stenographer: - gridPos: - x: 0 - y: 205 - h: 1 - w: 24 - stenographer_packet_loss_graph: - gridPos: - x: 0 - y: 206 - h: 8 - w: 16 - stenographer_pcap_retention_graph: - gridPos: - x: 16 - y: 206 - h: 8 - w: 8 - - row_influxdb: - gridPos: - x: 0 - y: 214 - h: 1 - w: 24 - influxdb_db_size_graph: - gridPos: - x: 0 - y: 214 - h: 8 - w: 24 - - - receiver: - templating: - list: - servername: {} - role: - allValue: false - multi: false - hide: 2 - containers: {} - manint: {} - monint: {} - cpucount: {} - disk: {} - panels: - row_overview: - gridPos: - x: 0 - y: 0 - h: 1 - w: 24 - system_uptime: - gridPos: - x: 0 - y: 1 - h: 4 - w: 4 - load_average_5_minute_stat: - gridPos: - x: 4 - y: 1 - h: 4 - w: 4 - cpu_usage_guage: - gridPos: - x: 8 - y: 1 - h: 4 - w: 2 - ram_usage_guage: - gridPos: - x: 10 - y: 1 - h: 4 - w: 2 - swap_usage_guage: - gridPos: - x: 12 - y: 1 - h: 4 - w: 2 - rootfs_used_guage: - gridPos: - x: 14 - y: 1 - h: 4 - w: 2 - nsm_used_guage: - gridPos: - x: 16 - y: 1 - h: 4 - w: 2 - io_wait_stat: - gridPos: - x: 20 - y: 1 - h: 4 - w: 4 - logstash_estimated_eps_in_stat: - gridPos: - x: 0 - y: 5 - h: 4 - w: 4 - logstash_estimated_eps_out_stat: - gridPos: - x: 4 - y: 5 - h: 4 - w: 4 - redis_queue_stat: - gridPos: - x: 8 - y: 5 - h: 4 - w: 4 - - row_cpu: - gridPos: - x: 0 - y: 9 - h: 1 - w: 24 - cpu_usage_tasks_all_graph: - gridPos: - x: 0 - y: 10 - h: 8 - w: 24 - load_averages_graph: - gridPos: - x: 0 - y: 18 - h: 8 - w: 12 - process_status_graph: - gridPos: - x: 12 - y: 18 - h: 8 - w: 12 - - row_memory: - gridPos: - x: 0 - y: 26 - h: 1 - w: 24 - memory_usage_graph: - gridPos: - x: 0 - y: 27 - h: 8 - w: 24 - - row_swap: - gridPos: - x: 0 - y: 35 - h: 1 - w: 24 - swap_io_bytes_graph: - gridPos: - x: 0 - y: 36 - h: 8 - w: 12 - swap_usage_bytes_graph: - gridPos: - x: 12 - y: 36 - h: 8 - w: 12 - - row_network: - gridPos: - x: 0 - y: 44 - h: 1 - w: 24 - management_interface_traffic_both_graph: - gridPos: - x: 0 - y: 45 - h: 8 - w: 24 - management_interface_packets_graph: - gridPos: - x: 0 - y: 53 - h: 8 - w: 12 - management_interface_drops_graph: - gridPos: - x: 12 - y: 53 - h: 8 - w: 12 - - row_disk_usage: - gridPos: - x: 0 - y: 77 - h: 1 - w: 24 - disk_usage_root_graph: - gridPos: - x: 0 - y: 78 - h: 8 - w: 12 - disk_usage_nsm_graph: - gridPos: - x: 12 - y: 78 - h: 8 - w: 12 - - row_disk_iops: - gridPos: - x: 0 - y: 86 - h: 1 - w: 24 - disk_io_requests_graph: - gridPos: - x: 0 - y: 87 - h: 8 - w: 8 - disk_io_bytes_graph: - gridPos: - x: 8 - y: 87 - h: 8 - w: 8 - disk_io_time_graph: - gridPos: - x: 16 - y: 87 - h: 8 - w: 8 - - row_docker_details: - gridPos: - x: 0 - y: 95 - h: 1 - w: 24 - cpu_docker_combined_current_graph: - gridPos: - x: 0 - y: 96 - h: 8 - w: 24 - cpu_docker_combined_trend_graph: - gridPos: - x: 0 - y: 104 - h: 8 - w: 24 - memory_used_docker_combined_current_graph: - gridPos: - x: 0 - y: 112 - h: 8 - w: 24 - memory_used_docker_combined_trend_graph: - gridPos: - x: 0 - y: 120 - h: 8 - w: 24 - network_usage_docker_combined_current_graph: - gridPos: - x: 0 - y: 128 - h: 8 - w: 24 - network_usage_docker_combined_trend_graph: - gridPos: - x: 0 - y: 136 - h: 8 - w: 24 - uptime_docker_combined_current_graph: - gridPos: - x: 0 - y: 144 - h: 8 - w: 12 - uptime_docker_combined_trend_graph: - gridPos: - x: 12 - y: 144 - h: 8 - w: 12 - - row_logstash: - gridPos: - x: 0 - y: 152 - h: 1 - w: 24 - logstash_estimated_eps_in_graph: - gridPos: - x: 0 - y: 153 - h: 8 - w: 24 - logstash_estimated_eps_in_total_graph: - gridPos: - x: 0 - y: 161 - h: 8 - w: 24 - logstash_estimated_eps_out_graph: - gridPos: - x: 0 - y: 169 - h: 8 - w: 24 - logstash_estimated_eps_out_total_graph: - gridPos: - x: 0 - y: 172 - h: 8 - w: 24 - - row_redis: - gridPos: - x: 0 - y: 180 - h: 1 - w: 24 - redis_queue_graph: - gridPos: - x: 0 - y: 181 - h: 8 - w: 24 - - - pipeline_overview_nontc: - title: 'Pipeline Overview' - templating: - list: - searchnode: - includeAll: true - multi: true - hide: 2 - text: All - value: "$__all" - panels: - redis_queue_graph: - gridPos: - x: 0 - y: 0 - h: 8 - w: 8 - logstash_eps_in_out_manager_graph: - gridPos: - x: 8 - y: 0 - h: 8 - w: 8 - logstash_indexing_eps_in_searchnode_total_graph: - gridPos: - x: 16 - y: 0 - h: 8 - w: 8 - logstash_indexing_eps_in_out_searchnode_graph: - gridPos: - x: 0 - y: 8 - h: 8 - w: 24 - elasticsearch_ingest_performance_nontc_graph: - gridPos: - x: 0 - y: 16 - h: 8 - w: 24 - elasticsearch_pipeline_time_nontc_graph: - gridPos: - x: 0 - y: 24 - h: 8 - w: 24 - - - pipeline_overview_tc: - title: 'Pipeline Overview' - templating: - list: - searchnode: - includeAll: true - multi: true - hide: 2 - text: All - value: "$__all" - cluster_name: - includeAll: true - multi: true - hide: 2 - text: All - value: "$__all" - panels: - redis_queue_graph: - gridPos: - x: 0 - y: 0 - h: 8 - w: 8 - logstash_eps_in_out_manager_graph: - gridPos: - x: 8 - y: 0 - h: 8 - w: 8 - logstash_indexing_eps_in_searchnode_total_graph: - gridPos: - x: 16 - y: 0 - h: 8 - w: 8 - logstash_indexing_eps_in_out_searchnode_graph: - gridPos: - x: 0 - y: 8 - h: 8 - w: 24 - elasticsearch_ingest_performance_tc_graph: - gridPos: - x: 0 - y: 16 - h: 8 - w: 24 - elasticsearch_pipeline_time_tc_graph: - gridPos: - x: 0 - y: 24 - h: 8 - w: 24 diff --git a/salt/grafana/init.sls b/salt/grafana/init.sls deleted file mode 100644 index 1c5f30d5b..000000000 --- a/salt/grafana/init.sls +++ /dev/null @@ -1,164 +0,0 @@ -{% from 'allowed_states.map.jinja' import allowed_states %} -{% if sls in allowed_states %} -{% from 'vars/globals.map.jinja' import GLOBALS %} -{% from 'docker/docker.map.jinja' import DOCKER %} -{% set GRAFANA = salt['pillar.get']('manager:grafana', '0') %} -{% set ADMINPASS = salt['pillar.get']('secrets:grafana_admin') %} - -{% import_yaml 'grafana/grafana_defaults.yaml' as default_settings %} -{% set GRAFANA_SETTINGS = salt['grains.filter_by'](default_settings, default='grafana', merge=salt['pillar.get']('grafana', {})) %} - -{% if grains['role'] in ['so-manager', 'so-managersearch', 'so-standalone', 'so-eval'] %} - -{% set ALLOWED_DASHBOARDS = ['overview', 'standalone', 'manager', 'managersearch', 'sensor', 'searchnode', 'heavynode', 'eval', 'receiver'] %} -{% set DASHBOARDS = ['overview'] %} -{% if grains.role == 'so-eval' %} - {% do DASHBOARDS.append('eval') %} -{% else %} - {% if not salt['pillar.get']('elasticsearch:true_cluster', False) %} - {% do DASHBOARDS.append('pipeline_overview_nontc') %} - {% else %} - {% do DASHBOARDS.append('pipeline_overview_tc') %} - {% endif %} - {# Grab a unique listing of nodetypes that exists so that we create only the needed dashboards #} - {% for dashboard in salt['cmd.shell']("ls /opt/so/saltstack/local/pillar/minions/|awk -F'_' {'print $2'}|awk -F'.' {'print $1'}").split() %} - {% if dashboard in ALLOWED_DASHBOARDS %} - {% do DASHBOARDS.append(dashboard) %} - {% endif %} - {% endfor %} -{% endif %} - - - -# Grafana all the things -grafanadir: - file.directory: - - name: /nsm/grafana - - user: 939 - - group: 939 - - makedirs: True - -grafanaconfdir: - file.directory: - - name: /opt/so/conf/grafana/etc - - user: 939 - - group: 939 - - makedirs: True - -grafanadashdir: - file.directory: - - name: /opt/so/conf/grafana/grafana_dashboards - - user: 939 - - group: 939 - - makedirs: True - -{% for type in ['eval','manager','managersearch','search_nodes','sensor_nodes','standalone'] %} -remove_dashboard_dir_{{type}}: - file.absent: - - name: /opt/so/conf/grafana/grafana_dashboards/{{type}} -{% endfor %} - -grafana-dashboard-config: - file.managed: - - name: /opt/so/conf/grafana/etc/dashboards/dashboard.yml - - user: 939 - - group: 939 - - template: jinja - - source: salt://grafana/etc/dashboards/dashboard.yml - - makedirs: True - - -grafana-datasources-config: - file.managed: - - name: /opt/so/conf/grafana/etc/datasources/influxdb.yaml - - user: 939 - - group: 939 - - template: jinja - - source: salt://grafana/etc/datasources/influxdb.yaml - - makedirs: True - - defaults: - GLOBALS: {{ GLOBALS }} - -grafana-config: - file.managed: - - name: /opt/so/conf/grafana/etc/grafana.ini - - user: 939 - - group: 939 - - template: jinja - - source: salt://grafana/etc/grafana.ini.jinja - - context: - config: {{ GRAFANA_SETTINGS.config|json }} - -# these are the files that are referenced inside the config such as smtp:cert_file, smtp:cert_key, auth.ldap:config_file, enterprise:license_path -grafana-config-files: - file.recurse: - - name: /opt/so/conf/grafana/etc/files - - user: 939 - - group: 939 - - source: salt://grafana/etc/files - - makedirs: True - -so-grafana-dashboard-folder-delete: - cmd.run: - - name: /usr/sbin/so-grafana-dashboard-folder-delete - - unless: ls /opt/so/state/so-grafana-dashboard-folder-delete-complete - -{% for dashboard in DASHBOARDS | unique %} -{{dashboard}}-dashboard: - file.managed: - - name: /opt/so/conf/grafana/grafana_dashboards/{{dashboard}}.json - - user: 939 - - group: 939 - - template: jinja - - source: salt://grafana/dashboards/common_template.json.jinja - - defaults: - DASHBOARD: {{ dashboard }} - PANELS: {{GRAFANA_SETTINGS.dashboards[dashboard].panels}} - TEMPLATES: {{GRAFANA_SETTINGS.dashboards[dashboard].templating.list}} - TITLE: {{ GRAFANA_SETTINGS.dashboards[dashboard].get('title', dashboard| capitalize) }} - ID: {{ loop.index }} - UID: {{ dashboard }} -{% endfor %} - -so-grafana: - docker_container.running: - - image: {{ GLOBALS.registry_host }}:5000/{{ GLOBALS.image_repo }}/so-grafana:{{ GLOBALS.so_version }} - - hostname: grafana - - user: socore - - networks: - - sobridge: - - ipv4_address: {{ DOCKER.containers['so-grafana'].ip }} - - extra_hosts: - - {{GLOBALS.influxdb_host}}:{{pillar.node_data[GLOBALS.influxdb_host].ip}} - - binds: - - /nsm/grafana:/var/lib/grafana:rw - - /opt/so/conf/grafana/etc/grafana.ini:/etc/grafana/grafana.ini:ro - - /opt/so/conf/grafana/etc/datasources:/etc/grafana/provisioning/datasources:rw - - /opt/so/conf/grafana/etc/dashboards:/etc/grafana/provisioning/dashboards:rw - - /opt/so/conf/grafana/grafana_dashboards:/etc/grafana/grafana_dashboards:rw - - /opt/so/conf/grafana/etc/files:/etc/grafana/config/files:ro - - environment: - - GF_SECURITY_ADMIN_PASSWORD={{ ADMINPASS }} - - port_bindings: - {% for BINDING in DOCKER.containers['so-grafana'].port_bindings %} - - {{ BINDING }} - {% endfor %} - - watch: - - file: /opt/so/conf/grafana/* - - require: - - file: grafana-config - -append_so-grafana_so-status.conf: - file.append: - - name: /opt/so/conf/so-status/so-status.conf - - text: so-grafana - -{% endif %} - -{% else %} - -{{sls}}_state_not_allowed: - test.fail_without_changes: - - name: {{sls}}_state_not_allowed - -{% endif %} diff --git a/salt/grafana/panels/cpu_docker_combined_current_graph.json.jinja b/salt/grafana/panels/cpu_docker_combined_current_graph.json.jinja deleted file mode 100644 index 7d0f67135..000000000 --- a/salt/grafana/panels/cpu_docker_combined_current_graph.json.jinja +++ /dev/null @@ -1,223 +0,0 @@ -{ - "id": 100, - "gridPos": { - "x": {{ PANELS.cpu_docker_combined_current_graph.gridPos.x }}, - "y": {{ PANELS.cpu_docker_combined_current_graph.gridPos.y }}, - "w": {{ PANELS.cpu_docker_combined_current_graph.gridPos.w }}, - "h": {{ PANELS.cpu_docker_combined_current_graph.gridPos.h }} - }, - "type": "timeseries", - "title": "Container CPU Usage Current", - "transformations": [], - "datasource": "InfluxDB", - "pluginVersion": "8.2.1", - "interval": "30s", - "fieldConfig": { - "defaults": { - "custom": { - "drawStyle": "line", - "lineInterpolation": "linear", - "barAlignment": 0, - "lineWidth": 1, - "fillOpacity": 10, - "gradientMode": "none", - "spanNulls": false, - "showPoints": "never", - "pointSize": 5, - "stacking": { - "mode": "none", - "group": "A" - }, - "axisPlacement": "auto", - "axisLabel": "", - "scaleDistribution": { - "type": "linear" - }, - "hideFrom": { - "tooltip": false, - "viz": false, - "legend": false - }, - "thresholdsStyle": { - "mode": "off" - } - }, - "color": { - "mode": "palette-classic" - }, - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green", - "value": null - } - ] - }, - "mappings": [], - "decimals": 1, - "unit": "percent" - }, - "overrides": [ - { - "matcher": { - "id": "byRegexp", - "options": "/n_cpus/" - }, - "properties": [ - { - "id": "custom.fillOpacity", - "value": 0 - }, - { - "id": "color", - "value": { - "mode": "fixed", - "fixedColor": "dark-red" - } - } - ] - } - ] - }, - "options": { - "tooltip": { - "mode": "single" - }, - "legend": { - "displayMode": "table", - "placement": "right", - "calcs": [ - "max", - "mean", - "lastNotNull" - ] - } - }, - "targets": [ - { - "alias": "$tag_host: $tag_container_name", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "container_name" - ], - "type": "tag" - }, - { - "params": [ - "host" - ], - "type": "tag" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "hide": false, - "measurement": "docker_container_cpu", - "orderByTime": "ASC", - "policy": "default", - "query": "SELECT mean(\"usage_percent\") FROM \"docker_container_cpu\" WHERE (\"host\" =~ /^$servername$/ AND \"container_name\" =~ /^$containers$/) AND $timeFilter GROUP BY time($__interval), \"container_name\", \"host\" fill(null)", - "queryType": "randomWalk", - "rawQuery": false, - "refId": "A", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "usage_percent" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], - "tags": [ - { - "key": "host", - "operator": "=~", - "value": "/^$servername$/" - }, - { - "condition": "AND", - "key": "container_name", - "operator": "=~", - "value": "/^$containers$/" - } - ] - }, - { - "alias": "$tag_host: n_cpus*100", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "host" - ], - "type": "tag" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "hide": false, - "measurement": "system", - "orderByTime": "ASC", - "policy": "default", - "refId": "B", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "n_cpus" - ], - "type": "field" - }, - { - "params": [], - "type": "last" - }, - { - "params": [ - " * 100" - ], - "type": "math" - } - ] - ], - "tags": [ - { - "key": "host", - "operator": "=~", - "value": "/^$servername$/" - } - ] - } - ], - "maxDataPoints": null, - "timeFrom": null, - "timeShift": null -} diff --git a/salt/grafana/panels/cpu_docker_combined_trend_graph.json.jinja b/salt/grafana/panels/cpu_docker_combined_trend_graph.json.jinja deleted file mode 100644 index 2e2dbe797..000000000 --- a/salt/grafana/panels/cpu_docker_combined_trend_graph.json.jinja +++ /dev/null @@ -1,220 +0,0 @@ -{ - "id": 101, - "gridPos": { - "x": {{ PANELS.cpu_docker_combined_trend_graph.gridPos.x }}, - "y": {{ PANELS.cpu_docker_combined_trend_graph.gridPos.y }}, - "w": {{ PANELS.cpu_docker_combined_trend_graph.gridPos.w }}, - "h": {{ PANELS.cpu_docker_combined_trend_graph.gridPos.h }} - }, - "type": "timeseries", - "title": "Container CPU Usage Trend", - "datasource": "InfluxDB", - "pluginVersion": "8.2.1", - "interval": "30s", - "fieldConfig": { - "defaults": { - "custom": { - "drawStyle": "line", - "lineInterpolation": "linear", - "barAlignment": 0, - "lineWidth": 1, - "fillOpacity": 10, - "gradientMode": "none", - "spanNulls": true, - "showPoints": "never", - "pointSize": 5, - "stacking": { - "mode": "none", - "group": "A" - }, - "axisPlacement": "auto", - "axisLabel": "", - "scaleDistribution": { - "type": "linear" - }, - "hideFrom": { - "tooltip": false, - "viz": false, - "legend": false - }, - "thresholdsStyle": { - "mode": "off" - } - }, - "color": { - "mode": "palette-classic" - }, - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green", - "value": null - } - ] - }, - "mappings": [], - "decimals": 1, - "unit": "percent" - }, - "overrides": [ - { - "matcher": { - "id": "byRegexp", - "options": "/n_cpus/" - }, - "properties": [ - { - "id": "custom.fillOpacity", - "value": 0 - }, - { - "id": "color", - "value": { - "mode": "fixed", - "fixedColor": "dark-red" - } - } - ] - } - ] - }, - "options": { - "tooltip": { - "mode": "single" - }, - "legend": { - "displayMode": "table", - "placement": "right", - "calcs": [ - "max", - "mean", - "lastNotNull" - ] - } - }, - "targets": [ - { - "alias": "$tag_host: $tag_container_name", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "container_name" - ], - "type": "tag" - }, - { - "params": [ - "host" - ], - "type": "tag" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "measurement": "docker_container_cpu", - "orderByTime": "ASC", - "policy": "so_long_term", - "queryType": "randomWalk", - "refId": "A", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "mean_usage_percent" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], - "tags": [ - { - "key": "host", - "operator": "=~", - "value": "/^$servername$/" - }, - { - "condition": "AND", - "key": "container_name", - "operator": "=~", - "value": "/^$containers$/" - } - ] - }, - { - "alias": "$tag_host: n_cpus*100", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "host" - ], - "type": "tag" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "hide": false, - "measurement": "system", - "orderByTime": "ASC", - "policy": "so_long_term", - "refId": "B", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "mean_n_cpus" - ], - "type": "field" - }, - { - "params": [], - "type": "last" - }, - { - "params": [ - " * 100" - ], - "type": "math" - } - ] - ], - "tags": [ - { - "key": "host", - "operator": "=~", - "value": "/^$servername$/" - } - ] - } - ], - "description": "", - "maxDataPoints": null, - "timeFrom": null, - "timeShift": null -} diff --git a/salt/grafana/panels/cpu_usage_current_graph.json.jinja b/salt/grafana/panels/cpu_usage_current_graph.json.jinja deleted file mode 100644 index 15c70cedd..000000000 --- a/salt/grafana/panels/cpu_usage_current_graph.json.jinja +++ /dev/null @@ -1,150 +0,0 @@ -{ - "id": 69001, - "gridPos": { - "x": {{ PANELS.cpu_usage_current_graph.gridPos.x }}, - "y": {{ PANELS.cpu_usage_current_graph.gridPos.y }}, - "w": {{ PANELS.cpu_usage_current_graph.gridPos.w }}, - "h": {{ PANELS.cpu_usage_current_graph.gridPos.h }} - }, - "type": "timeseries", - "title": "CPU Usage", - "datasource": "InfluxDB", - "pluginVersion": "8.2.1", - "interval": "30", - "fieldConfig": { - "defaults": { - "custom": { - "drawStyle": "line", - "lineInterpolation": "linear", - "barAlignment": 0, - "lineWidth": 1, - "fillOpacity": 0, - "gradientMode": "none", - "spanNulls": false, - "showPoints": "never", - "pointSize": 5, - "stacking": { - "mode": "none", - "group": "A" - }, - "axisPlacement": "auto", - "axisLabel": "", - "scaleDistribution": { - "type": "linear" - }, - "hideFrom": { - "tooltip": false, - "viz": false, - "legend": false - }, - "thresholdsStyle": { - "mode": "off" - } - }, - "color": { - "mode": "palette-classic" - }, - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green", - "value": null - } - ] - }, - "mappings": [], - "unit": "percent", - "min": 0, - "decimals": 1 - }, - "overrides": [] - }, - "options": { - "tooltip": { - "mode": "single" - }, - "legend": { - "displayMode": "table", - "placement": "right", - "calcs": [ - "max", - "mean", - "lastNotNull" - ] - } - }, - "targets": [ - { - "alias": "$tag_host $tag_role", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "host" - ], - "type": "tag" - }, - { - "params": [ - "role" - ], - "type": "tag" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "measurement": "cpu", - "orderByTime": "ASC", - "policy": "default", - "queryType": "randomWalk", - "refId": "A", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "usage_idle" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - }, - { - "params": [ - "*-1 + 100" - ], - "type": "math" - } - ] - ], - "tags": [ - { - "key": "host", - "operator": "=~", - "value": "/^$servername$/" - }, - { - "condition": "AND", - "key": "cpu", - "operator": "=", - "value": "cpu-total" - } - ] - } - ], - "maxDataPoints": null, - "timeFrom": null, - "timeShift": null -} diff --git a/salt/grafana/panels/cpu_usage_guage.json.jinja b/salt/grafana/panels/cpu_usage_guage.json.jinja deleted file mode 100644 index d5cd949d8..000000000 --- a/salt/grafana/panels/cpu_usage_guage.json.jinja +++ /dev/null @@ -1,126 +0,0 @@ -{ - "id": 9, - "gridPos": { - "x": {{ PANELS.cpu_usage_guage.gridPos.x }}, - "y": {{ PANELS.cpu_usage_guage.gridPos.y }}, - "w": {{ PANELS.cpu_usage_guage.gridPos.w }}, - "h": {{ PANELS.cpu_usage_guage.gridPos.h }} - }, - "type": "gauge", - "title": "CPU usage", - "datasource": "InfluxDB", - "pluginVersion": "8.2.1", - "links": [], - "fieldConfig": { - "defaults": { - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "rgba(50, 172, 45, 0.97)", - "value": null - }, - { - "color": "rgba(237, 129, 40, 0.89)", - "value": 70 - }, - { - "color": "rgba(245, 54, 54, 0.9)", - "value": 80 - } - ] - }, - "mappings": [ - { - "options": { - "match": "null", - "result": { - "text": "N/A" - } - }, - "type": "special" - } - ], - "color": { - "mode": "thresholds" - }, - "max": 100, - "min": 0, - "unit": "percent" - }, - "overrides": [] - }, - "interval": "30", - "options": { - "reduceOptions": { - "values": false, - "calcs": [ - "lastNotNull" - ], - "fields": "" - }, - "orientation": "horizontal", - "showThresholdLabels": false, - "showThresholdMarkers": true, - "text": {} - }, - "targets": [ - { - "dsType": "influxdb", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "measurement": "cpu", - "policy": "default", - "refId": "A", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "usage_idle" - ], - "type": "field" - }, - { - "params": [], - "type": "last" - }, - { - "params": [ - "* -1 + 100" - ], - "type": "math" - } - ] - ], - "tags": [ - { - "key": "host", - "operator": "=", - "value": "$servername" - }, - { - "condition": "AND", - "key": "cpu", - "operator": "=", - "value": "cpu-total" - } - ], - "orderByTime": "ASC" - } - ], - "maxDataPoints": null, - "cacheTimeout": null -} diff --git a/salt/grafana/panels/cpu_usage_tasks_all_graph.json.jinja b/salt/grafana/panels/cpu_usage_tasks_all_graph.json.jinja deleted file mode 100644 index dea4c3d8c..000000000 --- a/salt/grafana/panels/cpu_usage_tasks_all_graph.json.jinja +++ /dev/null @@ -1,193 +0,0 @@ -{ - "id": 61871, - "gridPos": { - "x": {{ PANELS.cpu_usage_tasks_all_graph.gridPos.x }}, - "y": {{ PANELS.cpu_usage_tasks_all_graph.gridPos.y }}, - "w": {{ PANELS.cpu_usage_tasks_all_graph.gridPos.w }}, - "h": {{ PANELS.cpu_usage_tasks_all_graph.gridPos.h }} - }, - "type": "timeseries", - "title": "CPU Usage", - "datasource": "InfluxDB", - "pluginVersion": "8.2.1", - "interval": "30s", - "options": { - "tooltip": { - "mode": "single" - }, - "legend": { - "displayMode": "table", - "placement": "right", - "calcs": [ - "max", - "mean", - "lastNotNull" - ] - } - }, - "targets": [ - { - "alias": "$tag_host: $col", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "orderByTime": "ASC", - "policy": "default", - "query": "SELECT mean(usage_user) as \"user\", mean(usage_system) as \"system\", mean(usage_softirq) as \"softirq\", mean(usage_steal) as \"steal\", mean(usage_nice) as \"nice\", mean(usage_irq) as \"irq\", mean(usage_iowait) as \"iowait\", mean(usage_guest) as \"guest\", mean(usage_guest_nice) as \"guest_nice\" FROM \"cpu\" WHERE \"host\" =~ /^$servername$/ and cpu = 'cpu-total' AND $timeFilter GROUP BY time($__interval), *", - "queryType": "randomWalk", - "rawQuery": true, - "refId": "A", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "value" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], - "tags": [], - "hide": false - }, - { - "alias": "$tag_host: $col", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "hide": false, - "orderByTime": "ASC", - "policy": "default", - "query": "SELECT mean(mean_usage_user) as \"trend_user\", mean(mean_usage_system) as \"trend_system\", mean(mean_usage_softirq) as \"trend_softirq\", mean(mean_usage_steal) as \"trend_steal\", mean(mean_usage_nice) as \"trend_nice\", mean(mean_usage_irq) as \"trend_irq\", mean(mean_usage_iowait) as \"trend_iowait\", mean(mean_usage_guest) as \"trend_guest\", mean(mean_usage_guest_nice) as \"trend_guest_nice\" FROM \"so_long_term\".\"cpu\" WHERE \"host\" =~ /^$servername$/ and cpu = 'cpu-total' AND $timeFilter GROUP BY time($__interval), * fill(linear)", - "queryType": "randomWalk", - "rawQuery": true, - "refId": "B", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "value" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], - "tags": [] - } - ], - "fieldConfig": { - "defaults": { - "custom": { - "drawStyle": "line", - "lineInterpolation": "linear", - "barAlignment": 0, - "lineWidth": 1, - "fillOpacity": 10, - "gradientMode": "none", - "spanNulls": false, - "showPoints": "never", - "pointSize": 5, - "stacking": { - "mode": "none", - "group": "A" - }, - "axisPlacement": "auto", - "axisLabel": "", - "scaleDistribution": { - "type": "linear" - }, - "hideFrom": { - "tooltip": false, - "viz": false, - "legend": false - }, - "thresholdsStyle": { - "mode": "off" - } - }, - "color": { - "mode": "palette-classic" - }, - "thresholds": { - "mode": "absolute", - "steps": [ - { - "value": null, - "color": "green" - }, - { - "value": 80, - "color": "red" - } - ] - }, - "mappings": [], - "unit": "percent", - "min": 0, - "decimals": 1 - }, - "overrides": [ - { - "matcher": { - "id": "byRegexp", - "options": "/trend/" - }, - "properties": [ - { - "id": "custom.fillOpacity", - "value": 0 - }, - { - "id": "custom.lineWidth", - "value": 4 - }, - { - "id": "custom.lineStyle", - "value": { - "fill": "dash", - "dash": [ - 4, - 10 - ] - } - } - ] - } - ] - }, - "maxDataPoints": null, - "timeFrom": null, - "timeShift": null -} diff --git a/salt/grafana/panels/cpu_usage_tasks_blocked_graph.json.jinja b/salt/grafana/panels/cpu_usage_tasks_blocked_graph.json.jinja deleted file mode 100644 index 6a7371038..000000000 --- a/salt/grafana/panels/cpu_usage_tasks_blocked_graph.json.jinja +++ /dev/null @@ -1,124 +0,0 @@ -{ - "id": 69005, - "gridPos": { - "x": {{ PANELS.cpu_usage_tasks_blocked_graph.gridPos.x }}, - "y": {{ PANELS.cpu_usage_tasks_blocked_graph.gridPos.y }}, - "w": {{ PANELS.cpu_usage_tasks_blocked_graph.gridPos.w }}, - "h": {{ PANELS.cpu_usage_tasks_blocked_graph.gridPos.h }} - }, - "type": "timeseries", - "title": "CPU Tasks Blocked", - "datasource": "InfluxDB", - "pluginVersion": "8.2.1", - "fieldConfig": { - "defaults": { - "custom": { - "drawStyle": "line", - "lineInterpolation": "linear", - "barAlignment": 0, - "lineWidth": 1, - "fillOpacity": 0, - "gradientMode": "none", - "spanNulls": false, - "showPoints": "never", - "pointSize": 5, - "stacking": { - "mode": "none", - "group": "A" - }, - "axisPlacement": "auto", - "axisLabel": "", - "scaleDistribution": { - "type": "linear" - }, - "hideFrom": { - "tooltip": false, - "viz": false, - "legend": false - }, - "thresholdsStyle": { - "mode": "off" - } - }, - "color": { - "mode": "palette-classic" - }, - "thresholds": { - "mode": "absolute", - "steps": [ - { - "value": null, - "color": "green" - }, - { - "value": 80, - "color": "red" - } - ] - }, - "mappings": [], - "unit": "short", - "min": 0, - "decimals": 1 - }, - "overrides": [] - }, - "options": { - "tooltip": { - "mode": "single" - }, - "legend": { - "displayMode": "table", - "placement": "right", - "calcs": [ - "max", - "mean", - "lastNotNull" - ] - } - }, - "targets": [ - { - "alias": "$tag_host $tag_role", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "orderByTime": "ASC", - "policy": "default", - "query": "SELECT mean(blocked) as blocked FROM \"processes\" WHERE host =~ /$servername$/ AND $timeFilter GROUP BY time($__interval), host, role ORDER BY asc", - "queryType": "randomWalk", - "rawQuery": true, - "refId": "A", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "value" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], - "tags": [] - } - ], - "timeFrom": null, - "timeShift": null, - "interval": "30s" -} diff --git a/salt/grafana/panels/cpu_usage_tasks_paging_graph.json.jinja b/salt/grafana/panels/cpu_usage_tasks_paging_graph.json.jinja deleted file mode 100644 index 2f56dffaa..000000000 --- a/salt/grafana/panels/cpu_usage_tasks_paging_graph.json.jinja +++ /dev/null @@ -1,124 +0,0 @@ -{ - "id": 69008, - "gridPos": { - "x": {{ PANELS.cpu_usage_tasks_paging_graph.gridPos.x }}, - "y": {{ PANELS.cpu_usage_tasks_paging_graph.gridPos.y }}, - "w": {{ PANELS.cpu_usage_tasks_paging_graph.gridPos.w }}, - "h": {{ PANELS.cpu_usage_tasks_paging_graph.gridPos.h }} - }, - "type": "timeseries", - "title": "CPU Tasks Paging", - "datasource": "InfluxDB", - "pluginVersion": "8.2.1", - "fieldConfig": { - "defaults": { - "custom": { - "drawStyle": "line", - "lineInterpolation": "linear", - "barAlignment": 0, - "lineWidth": 1, - "fillOpacity": 0, - "gradientMode": "none", - "spanNulls": false, - "showPoints": "never", - "pointSize": 5, - "stacking": { - "mode": "none", - "group": "A" - }, - "axisPlacement": "auto", - "axisLabel": "", - "scaleDistribution": { - "type": "linear" - }, - "hideFrom": { - "tooltip": false, - "viz": false, - "legend": false - }, - "thresholdsStyle": { - "mode": "off" - } - }, - "color": { - "mode": "palette-classic" - }, - "thresholds": { - "mode": "absolute", - "steps": [ - { - "value": null, - "color": "green" - }, - { - "value": 80, - "color": "red" - } - ] - }, - "mappings": [], - "unit": "short", - "min": 0, - "decimals": 1 - }, - "overrides": [] - }, - "options": { - "tooltip": { - "mode": "single" - }, - "legend": { - "displayMode": "table", - "placement": "right", - "calcs": [ - "max", - "mean", - "lastNotNull" - ] - } - }, - "targets": [ - { - "alias": "$tag_host $tag_role", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "orderByTime": "ASC", - "policy": "default", - "query": "SELECT mean(paging) as paging FROM \"processes\" WHERE host =~ /$servername$/ AND $timeFilter GROUP BY time($__interval), host, role ORDER BY asc", - "queryType": "randomWalk", - "rawQuery": true, - "refId": "A", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "value" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], - "tags": [] - } - ], - "interval": "30s", - "timeFrom": null, - "timeShift": null -} diff --git a/salt/grafana/panels/cpu_usage_tasks_running_graph.json.jinja b/salt/grafana/panels/cpu_usage_tasks_running_graph.json.jinja deleted file mode 100644 index 657321696..000000000 --- a/salt/grafana/panels/cpu_usage_tasks_running_graph.json.jinja +++ /dev/null @@ -1,124 +0,0 @@ -{ - "id": 69003, - "gridPos": { - "x": {{ PANELS.cpu_usage_tasks_running_graph.gridPos.x }}, - "y": {{ PANELS.cpu_usage_tasks_running_graph.gridPos.y }}, - "w": {{ PANELS.cpu_usage_tasks_running_graph.gridPos.w }}, - "h": {{ PANELS.cpu_usage_tasks_running_graph.gridPos.h }} - }, - "type": "timeseries", - "title": "CPU Tasks Running", - "datasource": "InfluxDB", - "pluginVersion": "8.2.1", - "fieldConfig": { - "defaults": { - "custom": { - "drawStyle": "line", - "lineInterpolation": "linear", - "barAlignment": 0, - "lineWidth": 1, - "fillOpacity": 0, - "gradientMode": "none", - "spanNulls": false, - "showPoints": "never", - "pointSize": 5, - "stacking": { - "mode": "none", - "group": "A" - }, - "axisPlacement": "auto", - "axisLabel": "", - "scaleDistribution": { - "type": "linear" - }, - "hideFrom": { - "tooltip": false, - "viz": false, - "legend": false - }, - "thresholdsStyle": { - "mode": "off" - } - }, - "color": { - "mode": "palette-classic" - }, - "thresholds": { - "mode": "absolute", - "steps": [ - { - "value": null, - "color": "green" - }, - { - "value": 80, - "color": "red" - } - ] - }, - "mappings": [], - "unit": "short", - "min": 0, - "decimals": 1 - }, - "overrides": [] - }, - "options": { - "tooltip": { - "mode": "single" - }, - "legend": { - "displayMode": "table", - "placement": "right", - "calcs": [ - "max", - "mean", - "lastNotNull" - ] - } - }, - "targets": [ - { - "alias": "$tag_host $tag_role", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "orderByTime": "ASC", - "policy": "default", - "query": "SELECT mean(running) as running FROM \"processes\" WHERE host =~ /$servername$/ AND $timeFilter GROUP BY time($__interval), host, role ORDER BY asc", - "queryType": "randomWalk", - "rawQuery": true, - "refId": "A", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "value" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], - "tags": [] - } - ], - "timeFrom": null, - "timeShift": null, - "interval": "30s" -} diff --git a/salt/grafana/panels/cpu_usage_tasks_sleeping_graph.json.jinja b/salt/grafana/panels/cpu_usage_tasks_sleeping_graph.json.jinja deleted file mode 100644 index e88272d2d..000000000 --- a/salt/grafana/panels/cpu_usage_tasks_sleeping_graph.json.jinja +++ /dev/null @@ -1,124 +0,0 @@ -{ - "id": 69006, - "gridPos": { - "x": {{ PANELS.cpu_usage_tasks_sleeping_graph.gridPos.x }}, - "y": {{ PANELS.cpu_usage_tasks_sleeping_graph.gridPos.y }}, - "w": {{ PANELS.cpu_usage_tasks_sleeping_graph.gridPos.w }}, - "h": {{ PANELS.cpu_usage_tasks_sleeping_graph.gridPos.h }} - }, - "type": "timeseries", - "title": "CPU Tasks Sleeping", - "datasource": "InfluxDB", - "pluginVersion": "8.2.1", - "fieldConfig": { - "defaults": { - "custom": { - "drawStyle": "line", - "lineInterpolation": "linear", - "barAlignment": 0, - "lineWidth": 1, - "fillOpacity": 0, - "gradientMode": "none", - "spanNulls": false, - "showPoints": "never", - "pointSize": 5, - "stacking": { - "mode": "none", - "group": "A" - }, - "axisPlacement": "auto", - "axisLabel": "", - "scaleDistribution": { - "type": "linear" - }, - "hideFrom": { - "tooltip": false, - "viz": false, - "legend": false - }, - "thresholdsStyle": { - "mode": "off" - } - }, - "color": { - "mode": "palette-classic" - }, - "thresholds": { - "mode": "absolute", - "steps": [ - { - "value": null, - "color": "green" - }, - { - "value": 80, - "color": "red" - } - ] - }, - "mappings": [], - "unit": "short", - "min": 0, - "decimals": 1 - }, - "overrides": [] - }, - "options": { - "tooltip": { - "mode": "single" - }, - "legend": { - "displayMode": "table", - "placement": "right", - "calcs": [ - "max", - "mean", - "lastNotNull" - ] - } - }, - "targets": [ - { - "alias": "$tag_host $tag_role", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "orderByTime": "ASC", - "policy": "default", - "query": "SELECT mean(sleeping) as sleeping FROM \"processes\" WHERE host =~ /$servername$/ AND $timeFilter GROUP BY time($__interval), host, role ORDER BY asc", - "queryType": "randomWalk", - "rawQuery": true, - "refId": "A", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "value" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], - "tags": [] - } - ], - "timeFrom": null, - "timeShift": null, - "interval": "30s" -} diff --git a/salt/grafana/panels/cpu_usage_tasks_stopped_graph.json.jinja b/salt/grafana/panels/cpu_usage_tasks_stopped_graph.json.jinja deleted file mode 100644 index d45d59a18..000000000 --- a/salt/grafana/panels/cpu_usage_tasks_stopped_graph.json.jinja +++ /dev/null @@ -1,124 +0,0 @@ -{ - "id": 69007, - "gridPos": { - "x": {{ PANELS.cpu_usage_tasks_stopped_graph.gridPos.x }}, - "y": {{ PANELS.cpu_usage_tasks_stopped_graph.gridPos.y }}, - "w": {{ PANELS.cpu_usage_tasks_stopped_graph.gridPos.w }}, - "h": {{ PANELS.cpu_usage_tasks_stopped_graph.gridPos.h }} - }, - "type": "timeseries", - "title": "CPU Tasks Stopped", - "datasource": "InfluxDB", - "pluginVersion": "8.2.1", - "fieldConfig": { - "defaults": { - "custom": { - "drawStyle": "line", - "lineInterpolation": "linear", - "barAlignment": 0, - "lineWidth": 1, - "fillOpacity": 0, - "gradientMode": "none", - "spanNulls": false, - "showPoints": "never", - "pointSize": 5, - "stacking": { - "mode": "none", - "group": "A" - }, - "axisPlacement": "auto", - "axisLabel": "", - "scaleDistribution": { - "type": "linear" - }, - "hideFrom": { - "tooltip": false, - "viz": false, - "legend": false - }, - "thresholdsStyle": { - "mode": "off" - } - }, - "color": { - "mode": "palette-classic" - }, - "thresholds": { - "mode": "absolute", - "steps": [ - { - "value": null, - "color": "green" - }, - { - "value": 80, - "color": "red" - } - ] - }, - "mappings": [], - "unit": "short", - "min": 0, - "decimals": 1 - }, - "overrides": [] - }, - "options": { - "tooltip": { - "mode": "single" - }, - "legend": { - "displayMode": "table", - "placement": "right", - "calcs": [ - "max", - "mean", - "lastNotNull" - ] - } - }, - "targets": [ - { - "alias": "$tag_host $tag_role", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "orderByTime": "ASC", - "policy": "default", - "query": "SELECT mean(stopped) as stopped FROM \"processes\" WHERE host =~ /$servername$/ AND $timeFilter GROUP BY time($__interval), host, role ORDER BY asc", - "queryType": "randomWalk", - "rawQuery": true, - "refId": "A", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "value" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], - "tags": [] - } - ], - "timeFrom": null, - "timeShift": null, - "interval": "30s" -} diff --git a/salt/grafana/panels/cpu_usage_tasks_unknown_graph.json.jinja b/salt/grafana/panels/cpu_usage_tasks_unknown_graph.json.jinja deleted file mode 100644 index f0c3005eb..000000000 --- a/salt/grafana/panels/cpu_usage_tasks_unknown_graph.json.jinja +++ /dev/null @@ -1,124 +0,0 @@ -{ - "id": 69009, - "gridPos": { - "x": {{ PANELS.cpu_usage_tasks_unknown_graph.gridPos.x }}, - "y": {{ PANELS.cpu_usage_tasks_unknown_graph.gridPos.y }}, - "w": {{ PANELS.cpu_usage_tasks_unknown_graph.gridPos.w }}, - "h": {{ PANELS.cpu_usage_tasks_unknown_graph.gridPos.h }} - }, - "type": "timeseries", - "title": "CPU Tasks Unknown", - "datasource": "InfluxDB", - "pluginVersion": "8.2.1", - "fieldConfig": { - "defaults": { - "custom": { - "drawStyle": "line", - "lineInterpolation": "linear", - "barAlignment": 0, - "lineWidth": 1, - "fillOpacity": 0, - "gradientMode": "none", - "spanNulls": false, - "showPoints": "never", - "pointSize": 5, - "stacking": { - "mode": "none", - "group": "A" - }, - "axisPlacement": "auto", - "axisLabel": "", - "scaleDistribution": { - "type": "linear" - }, - "hideFrom": { - "tooltip": false, - "viz": false, - "legend": false - }, - "thresholdsStyle": { - "mode": "off" - } - }, - "color": { - "mode": "palette-classic" - }, - "thresholds": { - "mode": "absolute", - "steps": [ - { - "value": null, - "color": "green" - }, - { - "value": 80, - "color": "red" - } - ] - }, - "mappings": [], - "unit": "short", - "min": 0, - "decimals": 1 - }, - "overrides": [] - }, - "options": { - "tooltip": { - "mode": "single" - }, - "legend": { - "displayMode": "table", - "placement": "right", - "calcs": [ - "max", - "mean", - "lastNotNull" - ] - } - }, - "targets": [ - { - "alias": "$tag_host $tag_role", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "orderByTime": "ASC", - "policy": "default", - "query": "SELECT mean(unknown) as unknown FROM \"processes\" WHERE host =~ /$servername$/ AND $timeFilter GROUP BY time($__interval), host, role ORDER BY asc", - "queryType": "randomWalk", - "rawQuery": true, - "refId": "A", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "value" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], - "tags": [] - } - ], - "timeFrom": null, - "timeShift": null, - "interval": "30s" -} diff --git a/salt/grafana/panels/cpu_usage_tasks_zombies_graph.json.jinja b/salt/grafana/panels/cpu_usage_tasks_zombies_graph.json.jinja deleted file mode 100644 index 20149ae3b..000000000 --- a/salt/grafana/panels/cpu_usage_tasks_zombies_graph.json.jinja +++ /dev/null @@ -1,124 +0,0 @@ -{ - "id": 69004, - "gridPos": { - "x": {{ PANELS.cpu_usage_tasks_zombies_graph.gridPos.x }}, - "y": {{ PANELS.cpu_usage_tasks_zombies_graph.gridPos.y }}, - "w": {{ PANELS.cpu_usage_tasks_zombies_graph.gridPos.w }}, - "h": {{ PANELS.cpu_usage_tasks_zombies_graph.gridPos.h }} - }, - "type": "timeseries", - "title": "CPU Tasks Zombies", - "datasource": "InfluxDB", - "pluginVersion": "8.2.1", - "fieldConfig": { - "defaults": { - "custom": { - "drawStyle": "line", - "lineInterpolation": "linear", - "barAlignment": 0, - "lineWidth": 1, - "fillOpacity": 0, - "gradientMode": "none", - "spanNulls": false, - "showPoints": "never", - "pointSize": 5, - "stacking": { - "mode": "none", - "group": "A" - }, - "axisPlacement": "auto", - "axisLabel": "", - "scaleDistribution": { - "type": "linear" - }, - "hideFrom": { - "tooltip": false, - "viz": false, - "legend": false - }, - "thresholdsStyle": { - "mode": "off" - } - }, - "color": { - "mode": "palette-classic" - }, - "thresholds": { - "mode": "absolute", - "steps": [ - { - "value": null, - "color": "green" - }, - { - "value": 80, - "color": "red" - } - ] - }, - "mappings": [], - "unit": "short", - "min": 0, - "decimals": 1 - }, - "overrides": [] - }, - "options": { - "tooltip": { - "mode": "single" - }, - "legend": { - "displayMode": "table", - "placement": "right", - "calcs": [ - "max", - "mean", - "lastNotNull" - ] - } - }, - "targets": [ - { - "alias": "$tag_host $tag_role", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "orderByTime": "ASC", - "policy": "default", - "query": "SELECT mean(zombies) as zombies FROM \"processes\" WHERE host =~ /$servername$/ AND $timeFilter GROUP BY time($__interval), host, role ORDER BY asc", - "queryType": "randomWalk", - "rawQuery": true, - "refId": "A", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "value" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], - "tags": [] - } - ], - "timeFrom": null, - "timeShift": null, - "interval": "30s" -} diff --git a/salt/grafana/panels/disk_io_bytes_graph.json.jinja b/salt/grafana/panels/disk_io_bytes_graph.json.jinja deleted file mode 100644 index 4b9c4c7ff..000000000 --- a/salt/grafana/panels/disk_io_bytes_graph.json.jinja +++ /dev/null @@ -1,189 +0,0 @@ -{ - "id": 60200, - "gridPos": { - "x": {{ PANELS.disk_io_bytes_graph.gridPos.x }}, - "y": {{ PANELS.disk_io_bytes_graph.gridPos.y }}, - "w": {{ PANELS.disk_io_bytes_graph.gridPos.w }}, - "h": {{ PANELS.disk_io_bytes_graph.gridPos.h }} - }, - "type": "timeseries", - "title": "Disk I/O bytes for /dev/$disk", - "datasource": "InfluxDB", - "pluginVersion": "8.2.1", - "interval": "30s", - "links": [], - "fieldConfig": { - "defaults": { - "custom": { - "drawStyle": "line", - "lineInterpolation": "linear", - "barAlignment": 0, - "lineWidth": 1, - "fillOpacity": 10, - "gradientMode": "none", - "spanNulls": false, - "showPoints": "never", - "pointSize": 5, - "stacking": { - "mode": "none", - "group": "A" - }, - "axisPlacement": "auto", - "axisLabel": "", - "scaleDistribution": { - "type": "linear" - }, - "hideFrom": { - "tooltip": false, - "viz": false, - "legend": false - }, - "thresholdsStyle": { - "mode": "off" - } - }, - "color": { - "mode": "palette-classic" - }, - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green", - "value": null - } - ] - }, - "mappings": [], - "links": [], - "unit": "bytes", - "decimals": 1 - }, - "overrides": [] - }, - "options": { - "tooltip": { - "mode": "single" - }, - "legend": { - "displayMode": "table", - "placement": "bottom", - "calcs": [ - "max", - "mean", - "lastNotNull" - ] - } - }, - "targets": [ - { - "alias": "$tag_host: $tag_name: $col", - "dsType": "influxdb", - "function": "mean", - "groupBy": [ - { - "interval": "auto", - "params": [ - "auto" - ], - "type": "time" - }, - { - "key": "host", - "params": [ - "tag" - ], - "type": "tag" - }, - { - "key": "path", - "params": [ - "tag" - ], - "type": "tag" - } - ], - "measurement": "io_reads", - "policy": "default", - "query": "SELECT non_negative_derivative(mean(read_bytes),1s) as \"read\" FROM \"diskio\" WHERE \"host\" =~ /$servername$/ AND \"name\" =~ /$disk$/ AND $timeFilter GROUP BY time($__interval), *", - "rawQuery": true, - "refId": "B", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "value" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], - "tags": [] - }, - { - "alias": "$tag_host: $tag_name: $col", - "dsType": "influxdb", - "function": "mean", - "groupBy": [ - { - "interval": "auto", - "params": [ - "auto" - ], - "type": "time" - }, - { - "key": "host", - "params": [ - "tag" - ], - "type": "tag" - }, - { - "key": "path", - "params": [ - "tag" - ], - "type": "tag" - } - ], - "measurement": "io_reads", - "policy": "default", - "query": "SELECT non_negative_derivative(mean(write_bytes),1s) as \"write\" FROM \"diskio\" WHERE \"host\" =~ /$servername$/ AND \"name\" =~ /$disk$/ AND $timeFilter GROUP BY time($__interval), *", - "rawQuery": true, - "refId": "C", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "value" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], - "tags": [] - } - ], - "scopedVars": { - "disk": { - "text": "sda", - "value": "sda", - "selected": false - } - }, - "maxDataPoints": null, - "repeat": null, - "timeFrom": null, - "timeShift": null -} diff --git a/salt/grafana/panels/disk_io_requests_graph.json.jinja b/salt/grafana/panels/disk_io_requests_graph.json.jinja deleted file mode 100644 index a3f95772c..000000000 --- a/salt/grafana/panels/disk_io_requests_graph.json.jinja +++ /dev/null @@ -1,190 +0,0 @@ -{ - "id": 13782, - "gridPos": { - "x": {{ PANELS.disk_io_requests_graph.gridPos.x }}, - "y": {{ PANELS.disk_io_requests_graph.gridPos.y }}, - "w": {{ PANELS.disk_io_requests_graph.gridPos.w }}, - "h": {{ PANELS.disk_io_requests_graph.gridPos.h }} - }, - "type": "timeseries", - "title": "Disk I/O requests for /dev/$disk", - "datasource": "InfluxDB", - "pluginVersion": "8.2.1", - "interval": "30s", - "links": [], - "fieldConfig": { - "defaults": { - "custom": { - "drawStyle": "line", - "lineInterpolation": "linear", - "barAlignment": 0, - "lineWidth": 1, - "fillOpacity": 10, - "gradientMode": "none", - "spanNulls": false, - "showPoints": "never", - "pointSize": 5, - "stacking": { - "mode": "none", - "group": "A" - }, - "axisPlacement": "auto", - "axisLabel": "", - "scaleDistribution": { - "type": "linear" - }, - "hideFrom": { - "tooltip": false, - "viz": false, - "legend": false - }, - "thresholdsStyle": { - "mode": "off" - } - }, - "color": { - "mode": "palette-classic" - }, - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green", - "value": null - } - ] - }, - "mappings": [], - "links": [], - "unit": "iops", - "decimals": 1 - }, - "overrides": [] - }, - "options": { - "tooltip": { - "mode": "single" - }, - "legend": { - "displayMode": "table", - "placement": "bottom", - "calcs": [ - "max", - "mean", - "lastNotNull" - ] - } - }, - "targets": [ - { - "alias": "$tag_host: $tag_name: $col", - "dsType": "influxdb", - "function": "mean", - "groupBy": [ - { - "interval": "auto", - "params": [ - "auto" - ], - "type": "time" - }, - { - "key": "host", - "params": [ - "tag" - ], - "type": "tag" - }, - { - "key": "path", - "params": [ - "tag" - ], - "type": "tag" - } - ], - "measurement": "io_reads", - "policy": "default", - "query": "SELECT non_negative_derivative(mean(reads),1s) as \"read\" FROM \"diskio\" WHERE \"host\" =~ /$servername$/ AND \"name\" =~ /$disk$/ AND $timeFilter GROUP BY time($__interval), *", - "rawQuery": true, - "refId": "B", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "value" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], - "tags": [], - "hide": false - }, - { - "alias": "$tag_host: $tag_name: $col", - "dsType": "influxdb", - "function": "mean", - "groupBy": [ - { - "interval": "auto", - "params": [ - "auto" - ], - "type": "time" - }, - { - "key": "host", - "params": [ - "tag" - ], - "type": "tag" - }, - { - "key": "path", - "params": [ - "tag" - ], - "type": "tag" - } - ], - "measurement": "io_reads", - "policy": "default", - "query": "SELECT non_negative_derivative(mean(writes),1s) as \"write\" FROM \"diskio\" WHERE \"host\" =~ /$servername$/ AND \"name\" =~ /$disk$/ AND $timeFilter GROUP BY time($__interval), *", - "rawQuery": true, - "refId": "C", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "value" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], - "tags": [] - } - ], - "scopedVars": { - "disk": { - "text": "sda", - "value": "sda", - "selected": false - } - }, - "maxDataPoints": null, - "repeat": null, - "timeFrom": null, - "timeShift": null -} diff --git a/salt/grafana/panels/disk_io_time_graph.json.jinja b/salt/grafana/panels/disk_io_time_graph.json.jinja deleted file mode 100644 index fa7c7b51e..000000000 --- a/salt/grafana/panels/disk_io_time_graph.json.jinja +++ /dev/null @@ -1,189 +0,0 @@ -{ - "id": 56720, - "gridPos": { - "x": {{ PANELS.disk_io_time_graph.gridPos.x }}, - "y": {{ PANELS.disk_io_time_graph.gridPos.y }}, - "w": {{ PANELS.disk_io_time_graph.gridPos.w }}, - "h": {{ PANELS.disk_io_time_graph.gridPos.h }} - }, - "type": "timeseries", - "title": "Disk I/O time for /dev/$disk", - "datasource": "InfluxDB", - "pluginVersion": "8.2.1", - "interval": "30s", - "links": [], - "fieldConfig": { - "defaults": { - "custom": { - "drawStyle": "line", - "lineInterpolation": "linear", - "barAlignment": 0, - "lineWidth": 1, - "fillOpacity": 10, - "gradientMode": "none", - "spanNulls": false, - "showPoints": "never", - "pointSize": 5, - "stacking": { - "mode": "none", - "group": "A" - }, - "axisPlacement": "auto", - "axisLabel": "", - "scaleDistribution": { - "type": "linear" - }, - "hideFrom": { - "tooltip": false, - "viz": false, - "legend": false - }, - "thresholdsStyle": { - "mode": "off" - } - }, - "color": { - "mode": "palette-classic" - }, - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green", - "value": null - } - ] - }, - "mappings": [], - "links": [], - "unit": "ms", - "decimals": 1 - }, - "overrides": [] - }, - "options": { - "tooltip": { - "mode": "single" - }, - "legend": { - "displayMode": "table", - "placement": "bottom", - "calcs": [ - "max", - "mean", - "lastNotNull" - ] - } - }, - "targets": [ - { - "alias": "$tag_host: $tag_name: $col", - "dsType": "influxdb", - "function": "mean", - "groupBy": [ - { - "interval": "auto", - "params": [ - "auto" - ], - "type": "time" - }, - { - "key": "host", - "params": [ - "tag" - ], - "type": "tag" - }, - { - "key": "path", - "params": [ - "tag" - ], - "type": "tag" - } - ], - "measurement": "io_reads", - "policy": "default", - "query": "SELECT non_negative_derivative(mean(read_time),1s) as \"read\" FROM \"diskio\" WHERE \"host\" =~ /$servername$/ AND \"name\" =~ /$disk$/ AND $timeFilter GROUP BY time($__interval), *", - "rawQuery": true, - "refId": "B", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "value" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], - "tags": [] - }, - { - "alias": "$tag_host: $tag_name: $col", - "dsType": "influxdb", - "function": "mean", - "groupBy": [ - { - "interval": "auto", - "params": [ - "auto" - ], - "type": "time" - }, - { - "key": "host", - "params": [ - "tag" - ], - "type": "tag" - }, - { - "key": "path", - "params": [ - "tag" - ], - "type": "tag" - } - ], - "measurement": "io_reads", - "policy": "default", - "query": "SELECT non_negative_derivative(mean(write_time),1s) as \"write\" FROM \"diskio\" WHERE \"host\" =~ /$servername$/ AND \"name\" =~ /$disk$/ AND $timeFilter GROUP BY time($__interval), *", - "rawQuery": true, - "refId": "A", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "value" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], - "tags": [] - } - ], - "scopedVars": { - "disk": { - "text": "sda", - "value": "sda", - "selected": false - } - }, - "maxDataPoints": null, - "repeat": null, - "timeFrom": null, - "timeShift": null -} diff --git a/salt/grafana/panels/disk_usage_nsm_graph.json.jinja b/salt/grafana/panels/disk_usage_nsm_graph.json.jinja deleted file mode 100644 index 90212b681..000000000 --- a/salt/grafana/panels/disk_usage_nsm_graph.json.jinja +++ /dev/null @@ -1,211 +0,0 @@ -{ - "id": 68888, - "gridPos": { - "x": {{ PANELS.disk_usage_nsm_graph.gridPos.x }}, - "y": {{ PANELS.disk_usage_nsm_graph.gridPos.y }}, - "w": {{ PANELS.disk_usage_nsm_graph.gridPos.w }}, - "h": {{ PANELS.disk_usage_nsm_graph.gridPos.h }} - }, - "type": "timeseries", - "title": "Disk Usage /nsm", - "datasource": "InfluxDB", - "pluginVersion": "8.2.1", - "interval": "30s", - "options": { - "tooltip": { - "mode": "single" - }, - "legend": { - "displayMode": "table", - "placement": "bottom", - "calcs": [ - "max", - "mean", - "lastNotNull" - ] - } - }, - "targets": [ - { - "alias": "$tag_host: mountpoint $tag_path - $col", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "orderByTime": "ASC", - "policy": "default", - "query": "SELECT mean(total) AS \"total\", mean(used) as \"used\" FROM \"disk\" WHERE \"host\" =~ /$servername$/ AND \"path\" = '/nsm' AND $timeFilter GROUP BY time($__interval), \"host\", \"path\"", - "queryType": "randomWalk", - "rawQuery": true, - "refId": "A", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "value" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], - "tags": [] - }, - { - "alias": "$tag_host: mountpoint $tag_path - $col", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "hide": false, - "orderByTime": "ASC", - "policy": "default", - "query": "SELECT mean(mean_total) AS \"trend_total\", mean(mean_used) as \"trend_used\" FROM \"so_long_term\".\"disk\" WHERE \"host\" =~ /$servername$/ AND \"path\" = '/nsm' AND $timeFilter GROUP BY time($__interval), \"host\", \"path\" fill(linear)", - "queryType": "randomWalk", - "rawQuery": true, - "refId": "B", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "value" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], - "tags": [] - } - ], - "fieldConfig": { - "defaults": { - "custom": { - "drawStyle": "line", - "lineInterpolation": "linear", - "barAlignment": 0, - "lineWidth": 1, - "fillOpacity": 10, - "gradientMode": "none", - "spanNulls": false, - "showPoints": "never", - "pointSize": 5, - "stacking": { - "mode": "none", - "group": "A" - }, - "axisPlacement": "auto", - "axisLabel": "", - "scaleDistribution": { - "type": "linear" - }, - "hideFrom": { - "tooltip": false, - "viz": false, - "legend": false - }, - "thresholdsStyle": { - "mode": "off" - } - }, - "color": { - "mode": "palette-classic" - }, - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green", - "value": null - } - ] - }, - "mappings": [], - "unit": "bytes", - "min": 0, - "decimals": 1 - }, - "overrides": [ - { - "matcher": { - "id": "byRegexp", - "options": "/total/" - }, - "properties": [ - { - "id": "color", - "value": { - "fixedColor": "#C4162A", - "mode": "fixed" - } - }, - { - "id": "custom.fillOpacity", - "value": 0 - }, - { - "id": "custom.lineWidth", - "value": 2 - } - ] - }, - { - "matcher": { - "id": "byRegexp", - "options": "/trend/" - }, - "properties": [ - { - "id": "custom.fillOpacity", - "value": 0 - }, - { - "id": "custom.lineWidth", - "value": 4 - }, - { - "id": "custom.lineStyle", - "value": { - "fill": "dash", - "dash": [ - 4, - 10 - ] - } - } - ] - } - ] - }, - "maxDataPoints": null, - "timeFrom": null, - "timeShift": null -} diff --git a/salt/grafana/panels/disk_usage_nsm_percent_graph.json.jinja b/salt/grafana/panels/disk_usage_nsm_percent_graph.json.jinja deleted file mode 100644 index 7486b29d9..000000000 --- a/salt/grafana/panels/disk_usage_nsm_percent_graph.json.jinja +++ /dev/null @@ -1,149 +0,0 @@ -{ - "id": 47230, - "gridPos": { - "x": {{ PANELS.disk_usage_nsm_percent_graph.gridPos.x }}, - "y": {{ PANELS.disk_usage_nsm_percent_graph.gridPos.y }}, - "w": {{ PANELS.disk_usage_nsm_percent_graph.gridPos.w }}, - "h": {{ PANELS.disk_usage_nsm_percent_graph.gridPos.h }} - }, - "type": "timeseries", - "title": "Disk Usage /nsm", - "datasource": "InfluxDB", - "pluginVersion": "8.2.1", - "interval": "30s", - "fieldConfig": { - "defaults": { - "custom": { - "drawStyle": "line", - "lineInterpolation": "linear", - "barAlignment": 0, - "lineWidth": 1, - "fillOpacity": 0, - "gradientMode": "none", - "spanNulls": false, - "showPoints": "never", - "pointSize": 5, - "stacking": { - "mode": "none", - "group": "A" - }, - "axisPlacement": "auto", - "axisLabel": "", - "scaleDistribution": { - "type": "linear" - }, - "hideFrom": { - "tooltip": false, - "viz": false, - "legend": false - }, - "thresholdsStyle": { - "mode": "off" - } - }, - "color": { - "mode": "palette-classic" - }, - "thresholds": { - "mode": "absolute", - "steps": [ - { - "value": null, - "color": "green" - }, - { - "value": 80, - "color": "red" - } - ] - }, - "mappings": [], - "unit": "percent", - "decimals": 1, - "min": 0, - "max": 100 - }, - "overrides": [] - }, - "options": { - "tooltip": { - "mode": "single" - }, - "legend": { - "displayMode": "table", - "placement": "right", - "calcs": [ - "lastNotNull" - ] - } - }, - "targets": [ - { - "alias": "$tag_host $tag_role", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "host" - ], - "type": "tag" - }, - { - "params": [ - "role" - ], - "type": "tag" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "measurement": "disk", - "orderByTime": "ASC", - "policy": "default", - "query": "SELECT mean(total) AS \"total\", mean(used) as \"used\" FROM \"disk\" WHERE \"host\" =~ /$servername$/ AND \"path\" = '/nsm' AND $timeFilter GROUP BY time($__interval), \"host\", \"path\"", - "queryType": "randomWalk", - "rawQuery": false, - "refId": "A", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "used_percent" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], - "tags": [ - { - "key": "host", - "operator": "=~", - "value": "/^$servername$/" - }, - { - "condition": "AND", - "key": "path", - "operator": "=", - "value": "/nsm" - } - ] - } - ], - "maxDataPoints": null, - "timeFrom": null, - "timeShift": null -} diff --git a/salt/grafana/panels/disk_usage_root_graph.json.jinja b/salt/grafana/panels/disk_usage_root_graph.json.jinja deleted file mode 100644 index 07ac20bbe..000000000 --- a/salt/grafana/panels/disk_usage_root_graph.json.jinja +++ /dev/null @@ -1,211 +0,0 @@ -{ - "id": 61880, - "gridPos": { - "x": {{ PANELS.disk_usage_root_graph.gridPos.x }}, - "y": {{ PANELS.disk_usage_root_graph.gridPos.y }}, - "w": {{ PANELS.disk_usage_root_graph.gridPos.w }}, - "h": {{ PANELS.disk_usage_root_graph.gridPos.h }} - }, - "type": "timeseries", - "title": "Disk Usage /", - "datasource": "InfluxDB", - "pluginVersion": "8.2.1", - "interval": "30s", - "options": { - "tooltip": { - "mode": "single" - }, - "legend": { - "displayMode": "table", - "placement": "bottom", - "calcs": [ - "max", - "mean", - "lastNotNull" - ] - } - }, - "targets": [ - { - "alias": "$tag_host: mountpoint $tag_path - $col", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "orderByTime": "ASC", - "policy": "default", - "query": "SELECT mean(total) AS \"total\", mean(used) as \"used\" FROM \"disk\" WHERE \"host\" =~ /$servername$/ AND \"path\" = '/' AND $timeFilter GROUP BY time($__interval), \"host\", \"path\"", - "queryType": "randomWalk", - "rawQuery": true, - "refId": "A", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "value" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], - "tags": [] - }, - { - "alias": "$tag_host: mountpoint $tag_path - $col", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "hide": false, - "orderByTime": "ASC", - "policy": "default", - "query": "SELECT mean(mean_total) AS \"trend_total\", mean(mean_used) as \"trend_used\" FROM \"so_long_term\".\"disk\" WHERE \"host\" =~ /$servername$/ AND \"path\" = '/' AND $timeFilter GROUP BY time($__interval), \"host\", \"path\" fill(linear)", - "queryType": "randomWalk", - "rawQuery": true, - "refId": "B", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "value" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], - "tags": [] - } - ], - "fieldConfig": { - "defaults": { - "custom": { - "drawStyle": "line", - "lineInterpolation": "stepAfter", - "barAlignment": 0, - "lineWidth": 1, - "fillOpacity": 10, - "gradientMode": "none", - "spanNulls": false, - "showPoints": "never", - "pointSize": 5, - "stacking": { - "mode": "none", - "group": "A" - }, - "axisPlacement": "auto", - "axisLabel": "", - "scaleDistribution": { - "type": "linear" - }, - "hideFrom": { - "tooltip": false, - "viz": false, - "legend": false - }, - "thresholdsStyle": { - "mode": "off" - } - }, - "color": { - "mode": "palette-classic" - }, - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green", - "value": null - } - ] - }, - "mappings": [], - "unit": "bytes", - "min": 0, - "decimals": 1 - }, - "overrides": [ - { - "matcher": { - "id": "byRegexp", - "options": "/total/" - }, - "properties": [ - { - "id": "color", - "value": { - "fixedColor": "#C4162A", - "mode": "fixed" - } - }, - { - "id": "custom.fillOpacity", - "value": 0 - }, - { - "id": "custom.lineWidth", - "value": 2 - } - ] - }, - { - "matcher": { - "id": "byRegexp", - "options": "/trend/" - }, - "properties": [ - { - "id": "custom.fillOpacity", - "value": 0 - }, - { - "id": "custom.lineWidth", - "value": 4 - }, - { - "id": "custom.lineStyle", - "value": { - "fill": "dash", - "dash": [ - 4, - 10 - ] - } - } - ] - } - ] - }, - "maxDataPoints": null, - "timeFrom": null, - "timeShift": null -} diff --git a/salt/grafana/panels/disk_usage_root_percent_graph.json.jinja b/salt/grafana/panels/disk_usage_root_percent_graph.json.jinja deleted file mode 100644 index 90cc3ff9b..000000000 --- a/salt/grafana/panels/disk_usage_root_percent_graph.json.jinja +++ /dev/null @@ -1,149 +0,0 @@ -{ - "id": 67830, - "gridPos": { - "x": {{ PANELS.disk_usage_root_percent_graph.gridPos.x }}, - "y": {{ PANELS.disk_usage_root_percent_graph.gridPos.y }}, - "w": {{ PANELS.disk_usage_root_percent_graph.gridPos.w }}, - "h": {{ PANELS.disk_usage_root_percent_graph.gridPos.h }} - }, - "type": "timeseries", - "title": "Disk Usage /", - "datasource": "InfluxDB", - "pluginVersion": "8.2.1", - "interval": "30s", - "fieldConfig": { - "defaults": { - "custom": { - "drawStyle": "line", - "lineInterpolation": "linear", - "barAlignment": 0, - "lineWidth": 1, - "fillOpacity": 0, - "gradientMode": "none", - "spanNulls": false, - "showPoints": "never", - "pointSize": 5, - "stacking": { - "mode": "none", - "group": "A" - }, - "axisPlacement": "auto", - "axisLabel": "", - "scaleDistribution": { - "type": "linear" - }, - "hideFrom": { - "tooltip": false, - "viz": false, - "legend": false - }, - "thresholdsStyle": { - "mode": "off" - } - }, - "color": { - "mode": "palette-classic" - }, - "thresholds": { - "mode": "absolute", - "steps": [ - { - "value": null, - "color": "green" - }, - { - "value": 80, - "color": "red" - } - ] - }, - "mappings": [], - "unit": "percent", - "decimals": 1, - "min": 0, - "max": 100 - }, - "overrides": [] - }, - "options": { - "tooltip": { - "mode": "single" - }, - "legend": { - "displayMode": "table", - "placement": "right", - "calcs": [ - "lastNotNull" - ] - } - }, - "targets": [ - { - "alias": "$tag_host $tag_role", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "host" - ], - "type": "tag" - }, - { - "params": [ - "role" - ], - "type": "tag" - }, - { - "params": [ - "none" - ], - "type": "fill" - } - ], - "measurement": "disk", - "orderByTime": "ASC", - "policy": "default", - "query": "SELECT mean(total) AS \"total\", mean(used) as \"used\" FROM \"disk\" WHERE \"host\" =~ /$servername$/ AND \"path\" = '/' AND $timeFilter GROUP BY time($__interval), \"host\", \"path\"", - "queryType": "randomWalk", - "rawQuery": false, - "refId": "A", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "used_percent" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], - "tags": [ - { - "key": "host", - "operator": "=~", - "value": "/^$servername$/" - }, - { - "condition": "AND", - "key": "path", - "operator": "=", - "value": "/" - } - ] - } - ], - "maxDataPoints": null, - "timeFrom": null, - "timeShift": null -} diff --git a/salt/grafana/panels/elasticsearch_document_count_graph.json.jinja b/salt/grafana/panels/elasticsearch_document_count_graph.json.jinja deleted file mode 100644 index fd296aeb1..000000000 --- a/salt/grafana/panels/elasticsearch_document_count_graph.json.jinja +++ /dev/null @@ -1,193 +0,0 @@ -{ - "datasource": "InfluxDB", - "fieldConfig": { - "defaults": {}, - "overrides": [] - }, - "gridPos": { - "x": {{ PANELS.elasticsearch_document_count_graph.gridPos.x }}, - "y": {{ PANELS.elasticsearch_document_count_graph.gridPos.y }}, - "w": {{ PANELS.elasticsearch_document_count_graph.gridPos.w }}, - "h": {{ PANELS.elasticsearch_document_count_graph.gridPos.h }} - }, - "id": 33, - "links": [], - "maxDataPoints": 750, - "nullPointMode": "connected", - "targets": [ - { - "dsType": "influxdb", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "measurement": "elasticsearch_indices", - "orderByTime": "ASC", - "policy": "default", - "refId": "A", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "docs_count" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], - "tags": [ - { - "key": "host", - "operator": "=", - "value": "$servername" - } - ], - "alias": "Document Count Current" - }, - { - "dsType": "influxdb", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "measurement": "elasticsearch_indices", - "orderByTime": "ASC", - "policy": "so_long_term", - "refId": "B", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "mean_docs_count" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], - "tags": [ - { - "key": "host", - "operator": "=", - "value": "$servername" - } - ], - "alias": "Document Count Trend", - "hide": false - } - ], - "thresholds": [], - "title": "Document Count", - "type": "graph", - "options": { - "alertThreshold": true - }, - "interval": "30s", - "pluginVersion": "7.5.4", - "renderer": "flot", - "yaxes": [ - { - "label": null, - "show": true, - "logBase": 1, - "min": null, - "max": null, - "format": "short", - "$$hashKey": "object:678" - }, - { - "label": null, - "show": true, - "logBase": 1, - "min": null, - "max": null, - "format": "short", - "$$hashKey": "object:679" - } - ], - "xaxis": { - "show": true, - "mode": "time", - "name": null, - "values": [], - "buckets": null - }, - "yaxis": { - "align": false, - "alignLevel": null - }, - "lines": true, - "fill": 1, - "linewidth": 1, - "dashLength": 10, - "spaceLength": 10, - "pointradius": 2, - "legend": { - "show": true, - "values": true, - "min": false, - "max": false, - "current": true, - "total": false, - "avg": false, - "alignAsTable": true, - "rightSide": false - }, - "tooltip": { - "value_type": "individual", - "shared": true, - "sort": 0 - }, - "aliasColors": {}, - "seriesOverrides": [ - { - "$$hashKey": "object:1050", - "alias": "/Trend/", - "fill": 0, - "linewidth": 4, - "dashes": true, - "dashLength": 4 - } - ], - "timeRegions": [], - "cacheTimeout": null, - "fillGradient": 0, - "dashes": false, - "hiddenSeries": false, - "points": false, - "bars": false, - "stack": false, - "percentage": false, - "steppedLine": false, - "timeFrom": null, - "timeShift": null -} diff --git a/salt/grafana/panels/elasticsearch_field_data_cache_size_graph.json.jinja b/salt/grafana/panels/elasticsearch_field_data_cache_size_graph.json.jinja deleted file mode 100644 index aee84c813..000000000 --- a/salt/grafana/panels/elasticsearch_field_data_cache_size_graph.json.jinja +++ /dev/null @@ -1,191 +0,0 @@ -{ - "aliasColors": {}, - "bars": false, - "maxDataPoints": 750, - "interval": "30s", - "dashLength": 10, - "dashes": false, - "datasource": "InfluxDB", - "fieldConfig": { - "defaults": { - "links": [] - }, - "overrides": [] - }, - "fill": 1, - "fillGradient": 0, - "gridPos": { - "x": {{ PANELS.elasticsearch_field_data_cache_size_graph.gridPos.x }}, - "y": {{ PANELS.elasticsearch_field_data_cache_size_graph.gridPos.y }}, - "w": {{ PANELS.elasticsearch_field_data_cache_size_graph.gridPos.w }}, - "h": {{ PANELS.elasticsearch_field_data_cache_size_graph.gridPos.h }} - }, - "hiddenSeries": false, - "id": 6363, - "legend": { - "alignAsTable": true, - "avg": true, - "current": true, - "hideEmpty": true, - "max": true, - "min": false, - "rightSide": false, - "show": true, - "sort": "current", - "sortDesc": true, - "total": false, - "values": true - }, - "lines": true, - "linewidth": 1, - "nullPointMode": "connected", - "options": { - "alertThreshold": true - }, - "percentage": false, - "pluginVersion": "7.5.4", - "pointradius": 2, - "points": false, - "renderer": "flot", - "seriesOverrides": [ - { - "alias": "/Trend/", - "dashLength": 4, - "dashes": true, - "fill": 0, - "linewidth": 4 - } - ], - "spaceLength": 10, - "stack": false, - "steppedLine": false, - "targets": [ - { - "alias": "Size Current", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "measurement": "elasticsearch_indices", - "orderByTime": "ASC", - "policy": "default", - "refId": "A", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "fielddata_memory_size_in_bytes" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], - "tags": [ - { - "key": "host", - "operator": "=", - "value": "$servername" - } - ] - }, - { - "alias": "Size Trend", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "hide": false, - "measurement": "elasticsearch_indices", - "orderByTime": "ASC", - "policy": "so_long_term", - "refId": "B", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "mean_fielddata_memory_size_in_bytes" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], - "tags": [ - { - "key": "host", - "operator": "=", - "value": "$servername" - } - ] - } - ], - "thresholds": [], - "timeFrom": null, - "timeRegions": [], - "timeShift": null, - "title": "Fielddata Cache Size", - "tooltip": { - "shared": true, - "sort": 0, - "value_type": "individual" - }, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "format": "decbytes", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - }, - { - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": false - } - ], - "yaxis": { - "align": false, - "alignLevel": null - } -} diff --git a/salt/grafana/panels/elasticsearch_ingest_performance_nontc_graph.json.jinja b/salt/grafana/panels/elasticsearch_ingest_performance_nontc_graph.json.jinja deleted file mode 100644 index 0166ae4b6..000000000 --- a/salt/grafana/panels/elasticsearch_ingest_performance_nontc_graph.json.jinja +++ /dev/null @@ -1,796 +0,0 @@ -{ - "id": 445549, - "gridPos": { - "x": {{ PANELS.elasticsearch_ingest_performance_nontc_graph.gridPos.x }}, - "y": {{ PANELS.elasticsearch_ingest_performance_nontc_graph.gridPos.y }}, - "w": {{ PANELS.elasticsearch_ingest_performance_nontc_graph.gridPos.w }}, - "h": {{ PANELS.elasticsearch_ingest_performance_nontc_graph.gridPos.h }} - }, - "type": "timeseries", - "title": "Elastic Ingest Performance - $searchnode", - "repeat": "searchnode", - "repeatDirection": "v", - "datasource": "InfluxDB", - "pluginVersion": "8.2.1", - "interval": "30s", - "fieldConfig": { - "defaults": { - "custom": { - "drawStyle": "line", - "lineInterpolation": "linear", - "barAlignment": 0, - "lineWidth": 1, - "fillOpacity": 10, - "gradientMode": "none", - "spanNulls": false, - "showPoints": "never", - "pointSize": 5, - "stacking": { - "mode": "none", - "group": "A" - }, - "axisPlacement": "auto", - "axisLabel": "", - "scaleDistribution": { - "type": "linear" - }, - "hideFrom": { - "tooltip": false, - "viz": false, - "legend": false - }, - "thresholdsStyle": { - "mode": "off" - } - }, - "color": { - "mode": "palette-classic" - }, - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green", - "value": null - } - ] - }, - "mappings": [], - "decimals": 0, - "unit": "ms" - }, - "overrides": [] - }, - "options": { - "tooltip": { - "mode": "multi" - }, - "legend": { - "displayMode": "table", - "placement": "right", - "calcs": [ - "max", - "mean" - ] - } - }, - "targets": [ - { - "alias": "community.id_time", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - } - ], - "hide": false, - "measurement": "elasticsearch_clusterstats_nodes", - "orderByTime": "ASC", - "policy": "default", - "queryType": "randomWalk", - "refId": "B", - "resultFormat": "time_series", - "select": [ - [ - { - "type": "field", - "params": [ - "ingest_processor_stats_community_id_time_in_millis" - ] - }, - { - "type": "mean", - "params": [] - }, - { - "type": "non_negative_difference", - "params": [] - } - ] - ], - "tags": [ - { - "key": "host", - "operator": "=", - "value": "$searchnode" - } - ] - }, - { - "alias": "conditionals_time", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - } - ], - "hide": false, - "measurement": "elasticsearch_clusterstats_nodes", - "orderByTime": "ASC", - "policy": "default", - "queryType": "randomWalk", - "refId": "C", - "resultFormat": "time_series", - "select": [ - [ - { - "type": "field", - "params": [ - "ingest_processor_stats_conditional_time_in_millis" - ] - }, - { - "type": "mean", - "params": [] - }, - { - "type": "non_negative_difference", - "params": [] - } - ] - ], - "tags": [ - { - "key": "host", - "operator": "=", - "value": "$searchnode" - } - ] - }, - { - "alias": "convert_time", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - } - ], - "hide": false, - "measurement": "elasticsearch_clusterstats_nodes", - "orderByTime": "ASC", - "policy": "default", - "queryType": "randomWalk", - "refId": "D", - "resultFormat": "time_series", - "select": [ - [ - { - "type": "field", - "params": [ - "ingest_processor_stats_convert_time_in_millis" - ] - }, - { - "type": "mean", - "params": [] - }, - { - "type": "non_negative_difference", - "params": [] - } - ] - ], - "tags": [ - { - "key": "host", - "operator": "=", - "value": "$searchnode" - } - ] - }, - { - "alias": "data.index.name_time", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - } - ], - "hide": false, - "measurement": "elasticsearch_clusterstats_nodes", - "orderByTime": "ASC", - "policy": "default", - "query": "SELECT non_negative_difference(mode(\"ingest_processor_stats_date_index_name_time_in_millis\")) FROM \"elasticsearch_clusterstats_nodes\" WHERE (\"role\" = 'manager') AND $timeFilter GROUP BY time($__interval) fill(linear)", - "queryType": "randomWalk", - "rawQuery": false, - "refId": "F", - "resultFormat": "time_series", - "select": [ - [ - { - "type": "field", - "params": [ - "ingest_processor_stats_date_index_name_time_in_millis" - ] - }, - { - "type": "mean", - "params": [] - }, - { - "type": "non_negative_difference", - "params": [] - } - ] - ], - "tags": [ - { - "key": "host", - "operator": "=", - "value": "$searchnode" - } - ] - }, - { - "alias": "data_time", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - } - ], - "hide": false, - "measurement": "elasticsearch_clusterstats_nodes", - "orderByTime": "ASC", - "policy": "default", - "query": "SELECT non_negative_difference(mode(\"ingest_processor_stats_date_index_name_time_in_millis\")) FROM \"elasticsearch_clusterstats_nodes\" WHERE (\"role\" = 'manager') AND $timeFilter GROUP BY time($__interval) fill(linear)", - "queryType": "randomWalk", - "rawQuery": false, - "refId": "G", - "resultFormat": "time_series", - "select": [ - [ - { - "type": "field", - "params": [ - "ingest_processor_stats_date_time_in_millis" - ] - }, - { - "type": "mean", - "params": [] - }, - { - "type": "non_negative_difference", - "params": [] - } - ] - ], - "tags": [ - { - "key": "host", - "operator": "=", - "value": "$searchnode" - } - ] - }, - { - "alias": "dissect_time", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - } - ], - "hide": false, - "measurement": "elasticsearch_clusterstats_nodes", - "orderByTime": "ASC", - "policy": "default", - "query": "SELECT non_negative_difference(mode(\"ingest_processor_stats_date_index_name_time_in_millis\")) FROM \"elasticsearch_clusterstats_nodes\" WHERE (\"role\" = 'manager') AND $timeFilter GROUP BY time($__interval) fill(linear)", - "queryType": "randomWalk", - "rawQuery": false, - "refId": "H", - "resultFormat": "time_series", - "select": [ - [ - { - "type": "field", - "params": [ - "ingest_processor_stats_dissect_time_in_millis" - ] - }, - { - "type": "mean", - "params": [] - }, - { - "type": "non_negative_difference", - "params": [] - } - ] - ], - "tags": [ - { - "key": "host", - "operator": "=", - "value": "$searchnode" - } - ] - }, - { - "alias": "dot.expander_time", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - } - ], - "hide": false, - "measurement": "elasticsearch_clusterstats_nodes", - "orderByTime": "ASC", - "policy": "default", - "query": "SELECT non_negative_difference(mode(\"ingest_processor_stats_date_index_name_time_in_millis\")) FROM \"elasticsearch_clusterstats_nodes\" WHERE (\"role\" = 'manager') AND $timeFilter GROUP BY time($__interval) fill(linear)", - "queryType": "randomWalk", - "rawQuery": false, - "refId": "I", - "resultFormat": "time_series", - "select": [ - [ - { - "type": "field", - "params": [ - "ingest_processor_stats_dot_expander_time_in_millis" - ] - }, - { - "type": "mean", - "params": [] - }, - { - "type": "non_negative_difference", - "params": [] - } - ] - ], - "tags": [ - { - "key": "host", - "operator": "=", - "value": "$searchnode" - } - ] - }, - { - "alias": "geoip_time", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - } - ], - "hide": false, - "measurement": "elasticsearch_clusterstats_nodes", - "orderByTime": "ASC", - "policy": "default", - "query": "SELECT non_negative_difference(mode(\"ingest_processor_stats_date_index_name_time_in_millis\")) FROM \"elasticsearch_clusterstats_nodes\" WHERE (\"role\" = 'manager') AND $timeFilter GROUP BY time($__interval) fill(linear)", - "queryType": "randomWalk", - "rawQuery": false, - "refId": "K", - "resultFormat": "time_series", - "select": [ - [ - { - "type": "field", - "params": [ - "ingest_processor_stats_geoip_time_in_millis" - ] - }, - { - "type": "mean", - "params": [] - }, - { - "type": "non_negative_difference", - "params": [] - } - ] - ], - "tags": [ - { - "key": "host", - "operator": "=", - "value": "$searchnode" - } - ] - }, - { - "alias": "grok_time", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - } - ], - "hide": false, - "measurement": "elasticsearch_clusterstats_nodes", - "orderByTime": "ASC", - "policy": "default", - "query": "SELECT non_negative_difference(mode(\"ingest_processor_stats_date_index_name_time_in_millis\")) FROM \"elasticsearch_clusterstats_nodes\" WHERE (\"role\" = 'manager') AND $timeFilter GROUP BY time($__interval) fill(linear)", - "queryType": "randomWalk", - "rawQuery": false, - "refId": "L", - "resultFormat": "time_series", - "select": [ - [ - { - "type": "field", - "params": [ - "ingest_processor_stats_grok_time_in_millis" - ] - }, - { - "type": "mean", - "params": [] - }, - { - "type": "non_negative_difference", - "params": [] - } - ] - ], - "tags": [ - { - "key": "host", - "operator": "=", - "value": "$searchnode" - } - ] - }, - { - "alias": "json_time", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - } - ], - "hide": false, - "measurement": "elasticsearch_clusterstats_nodes", - "orderByTime": "ASC", - "policy": "default", - "query": "SELECT non_negative_difference(mode(\"ingest_processor_stats_date_index_name_time_in_millis\")) FROM \"elasticsearch_clusterstats_nodes\" WHERE (\"role\" = 'manager') AND $timeFilter GROUP BY time($__interval) fill(linear)", - "queryType": "randomWalk", - "rawQuery": false, - "refId": "O", - "resultFormat": "time_series", - "select": [ - [ - { - "type": "field", - "params": [ - "ingest_processor_stats_json_time_in_millis" - ] - }, - { - "type": "mean", - "params": [] - }, - { - "type": "non_negative_difference", - "params": [] - } - ] - ], - "tags": [ - { - "key": "host", - "operator": "=", - "value": "$searchnode" - } - ] - }, - { - "alias": "kv_time", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - } - ], - "hide": false, - "measurement": "elasticsearch_clusterstats_nodes", - "orderByTime": "ASC", - "policy": "default", - "query": "SELECT non_negative_difference(mode(\"ingest_processor_stats_date_index_name_time_in_millis\")) FROM \"elasticsearch_clusterstats_nodes\" WHERE (\"role\" = 'manager') AND $timeFilter GROUP BY time($__interval) fill(linear)", - "queryType": "randomWalk", - "rawQuery": false, - "refId": "P", - "resultFormat": "time_series", - "select": [ - [ - { - "type": "field", - "params": [ - "ingest_processor_stats_kv_time_in_millis" - ] - }, - { - "type": "mean", - "params": [] - }, - { - "type": "non_negative_difference", - "params": [] - } - ] - ], - "tags": [ - { - "key": "host", - "operator": "=", - "value": "$searchnode" - } - ] - }, - { - "alias": "lowercase_time", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - } - ], - "hide": false, - "measurement": "elasticsearch_clusterstats_nodes", - "orderByTime": "ASC", - "policy": "default", - "query": "SELECT non_negative_difference(mode(\"ingest_processor_stats_date_index_name_time_in_millis\")) FROM \"elasticsearch_clusterstats_nodes\" WHERE (\"role\" = 'manager') AND $timeFilter GROUP BY time($__interval) fill(linear)", - "queryType": "randomWalk", - "rawQuery": false, - "refId": "Q", - "resultFormat": "time_series", - "select": [ - [ - { - "type": "field", - "params": [ - "ingest_processor_stats_lowercase_time_in_millis" - ] - }, - { - "type": "mean", - "params": [] - }, - { - "type": "non_negative_difference", - "params": [] - } - ] - ], - "tags": [ - { - "key": "host", - "operator": "=", - "value": "$searchnode" - } - ] - }, - { - "alias": "remove_time", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - } - ], - "hide": false, - "measurement": "elasticsearch_clusterstats_nodes", - "orderByTime": "ASC", - "policy": "default", - "query": "SELECT non_negative_difference(mode(\"ingest_processor_stats_date_index_name_time_in_millis\")) FROM \"elasticsearch_clusterstats_nodes\" WHERE (\"role\" = 'manager') AND $timeFilter GROUP BY time($__interval) fill(linear)", - "queryType": "randomWalk", - "rawQuery": false, - "refId": "R", - "resultFormat": "time_series", - "select": [ - [ - { - "type": "field", - "params": [ - "ingest_processor_stats_remove_time_in_millis" - ] - }, - { - "type": "mean", - "params": [] - }, - { - "type": "non_negative_difference", - "params": [] - } - ] - ], - "tags": [ - { - "key": "host", - "operator": "=", - "value": "$searchnode" - } - ] - }, - { - "alias": "rename_time", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - } - ], - "hide": false, - "measurement": "elasticsearch_clusterstats_nodes", - "orderByTime": "ASC", - "policy": "default", - "query": "SELECT non_negative_difference(mode(\"ingest_processor_stats_date_index_name_time_in_millis\")) FROM \"elasticsearch_clusterstats_nodes\" WHERE (\"role\" = 'manager') AND $timeFilter GROUP BY time($__interval) fill(linear)", - "queryType": "randomWalk", - "rawQuery": false, - "refId": "S", - "resultFormat": "time_series", - "select": [ - [ - { - "type": "field", - "params": [ - "ingest_processor_stats_rename_time_in_millis" - ] - }, - { - "type": "mean", - "params": [] - }, - { - "type": "non_negative_difference", - "params": [] - } - ] - ], - "tags": [ - { - "key": "host", - "operator": "=", - "value": "$searchnode" - } - ] - }, - { - "alias": "script_time", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - } - ], - "hide": false, - "measurement": "elasticsearch_clusterstats_nodes", - "orderByTime": "ASC", - "policy": "default", - "query": "SELECT non_negative_difference(mode(\"ingest_processor_stats_date_index_name_time_in_millis\")) FROM \"elasticsearch_clusterstats_nodes\" WHERE (\"role\" = 'manager') AND $timeFilter GROUP BY time($__interval) fill(linear)", - "queryType": "randomWalk", - "rawQuery": false, - "refId": "T", - "resultFormat": "time_series", - "select": [ - [ - { - "type": "field", - "params": [ - "ingest_processor_stats_script_time_in_millis" - ] - }, - { - "type": "mean", - "params": [] - }, - { - "type": "non_negative_difference", - "params": [] - } - ] - ], - "tags": [ - { - "key": "host", - "operator": "=", - "value": "$searchnode" - } - ] - }, - { - "alias": "url_decodes", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - } - ], - "hide": false, - "measurement": "elasticsearch_clusterstats_nodes", - "orderByTime": "ASC", - "policy": "default", - "query": "SELECT non_negative_difference(mode(\"ingest_processor_stats_date_index_name_time_in_millis\")) FROM \"elasticsearch_clusterstats_nodes\" WHERE (\"role\" = 'manager') AND $timeFilter GROUP BY time($__interval) fill(linear)", - "queryType": "randomWalk", - "rawQuery": false, - "refId": "U", - "resultFormat": "time_series", - "select": [ - [ - { - "type": "field", - "params": [ - "ingest_processor_stats_user_agent_time_in_millis" - ] - }, - { - "type": "mean", - "params": [] - }, - { - "type": "non_negative_difference", - "params": [] - } - ] - ], - "tags": [ - { - "key": "host", - "operator": "=", - "value": "$searchnode" - } - ] - } - ], - "description": "", - "timeFrom": null, - "timeShift": null -} diff --git a/salt/grafana/panels/elasticsearch_ingest_performance_tc_graph.json.jinja b/salt/grafana/panels/elasticsearch_ingest_performance_tc_graph.json.jinja deleted file mode 100644 index aaf997836..000000000 --- a/salt/grafana/panels/elasticsearch_ingest_performance_tc_graph.json.jinja +++ /dev/null @@ -1,793 +0,0 @@ -{ - "id": 445548, - "gridPos": { - "x": {{ PANELS.elasticsearch_ingest_performance_tc_graph.gridPos.x }}, - "y": {{ PANELS.elasticsearch_ingest_performance_tc_graph.gridPos.y }}, - "w": {{ PANELS.elasticsearch_ingest_performance_tc_graph.gridPos.w }}, - "h": {{ PANELS.elasticsearch_ingest_performance_tc_graph.gridPos.h }} - }, - "type": "timeseries", - "title": "Elastic Ingest Performance", - "datasource": "InfluxDB", - "pluginVersion": "8.2.1", - "interval": "30s", - "options": { - "tooltip": { - "mode": "multi" - }, - "legend": { - "displayMode": "table", - "placement": "right", - "calcs": [ - "max", - "mean" - ] - } - }, - "targets": [ - { - "alias": "community.id_time", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - } - ], - "hide": false, - "measurement": "elasticsearch_clusterstats_nodes", - "orderByTime": "ASC", - "policy": "default", - "queryType": "randomWalk", - "refId": "B", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "ingest_processor_stats_community_id_time_in_millis" - ], - "type": "field" - }, - { - "params": [], - "type": "last" - }, - { - "params": [], - "type": "non_negative_difference" - } - ] - ], - "tags": [ - { - "key": "cluster_name", - "operator": "=", - "value": "$cluster_name" - } - ] - }, - { - "alias": "conditionals_time", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - } - ], - "hide": false, - "measurement": "elasticsearch_clusterstats_nodes", - "orderByTime": "ASC", - "policy": "default", - "queryType": "randomWalk", - "refId": "C", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "ingest_processor_stats_conditional_time_in_millis" - ], - "type": "field" - }, - { - "params": [], - "type": "last" - }, - { - "params": [], - "type": "non_negative_difference" - } - ] - ], - "tags": [ - { - "key": "cluster_name", - "operator": "=", - "value": "$cluster_name" - } - ] - }, - { - "alias": "convert_time", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - } - ], - "hide": false, - "measurement": "elasticsearch_clusterstats_nodes", - "orderByTime": "ASC", - "policy": "default", - "queryType": "randomWalk", - "refId": "D", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "ingest_processor_stats_convert_time_in_millis" - ], - "type": "field" - }, - { - "params": [], - "type": "last" - }, - { - "params": [], - "type": "non_negative_difference" - } - ] - ], - "tags": [ - { - "key": "cluster_name", - "operator": "=", - "value": "$cluster_name" - } - ] - }, - { - "alias": "data.index.name_time", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - } - ], - "hide": false, - "measurement": "elasticsearch_clusterstats_nodes", - "orderByTime": "ASC", - "policy": "default", - "query": "SELECT non_negative_difference(mode(\"ingest_processor_stats_date_index_name_time_in_millis\")) FROM \"elasticsearch_clusterstats_nodes\" WHERE (\"cluster_name\" = '$cluster_name') AND $timeFilter GROUP BY time($__interval) fill(linear)", - "queryType": "randomWalk", - "rawQuery": false, - "refId": "F", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "ingest_processor_stats_date_index_name_time_in_millis" - ], - "type": "field" - }, - { - "params": [], - "type": "last" - }, - { - "params": [], - "type": "non_negative_difference" - } - ] - ], - "tags": [ - { - "key": "cluster_name", - "operator": "=", - "value": "$cluster_name" - } - ] - }, - { - "alias": "data_time", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - } - ], - "hide": false, - "measurement": "elasticsearch_clusterstats_nodes", - "orderByTime": "ASC", - "policy": "default", - "query": "SELECT non_negative_difference(mode(\"ingest_processor_stats_date_index_name_time_in_millis\")) FROM \"elasticsearch_clusterstats_nodes\" WHERE (\"cluster_name\" = '$cluster_name') AND $timeFilter GROUP BY time($__interval) fill(linear)", - "queryType": "randomWalk", - "rawQuery": false, - "refId": "G", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "ingest_processor_stats_date_time_in_millis" - ], - "type": "field" - }, - { - "params": [], - "type": "last" - }, - { - "params": [], - "type": "non_negative_difference" - } - ] - ], - "tags": [ - { - "key": "cluster_name", - "operator": "=", - "value": "$cluster_name" - } - ] - }, - { - "alias": "dissect_time", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - } - ], - "hide": false, - "measurement": "elasticsearch_clusterstats_nodes", - "orderByTime": "ASC", - "policy": "default", - "query": "SELECT non_negative_difference(mode(\"ingest_processor_stats_date_index_name_time_in_millis\")) FROM \"elasticsearch_clusterstats_nodes\" WHERE (\"cluster_name\" = '$cluster_name') AND $timeFilter GROUP BY time($__interval) fill(linear)", - "queryType": "randomWalk", - "rawQuery": false, - "refId": "H", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "ingest_processor_stats_dissect_time_in_millis" - ], - "type": "field" - }, - { - "params": [], - "type": "last" - }, - { - "params": [], - "type": "non_negative_difference" - } - ] - ], - "tags": [ - { - "key": "cluster_name", - "operator": "=", - "value": "$cluster_name" - } - ] - }, - { - "alias": "dot.expander_time", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - } - ], - "hide": false, - "measurement": "elasticsearch_clusterstats_nodes", - "orderByTime": "ASC", - "policy": "default", - "query": "SELECT non_negative_difference(mode(\"ingest_processor_stats_date_index_name_time_in_millis\")) FROM \"elasticsearch_clusterstats_nodes\" WHERE (\"cluster_name\" = '$cluster_name') AND $timeFilter GROUP BY time($__interval) fill(linear)", - "queryType": "randomWalk", - "rawQuery": false, - "refId": "I", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "ingest_processor_stats_dot_expander_time_in_millis" - ], - "type": "field" - }, - { - "params": [], - "type": "last" - }, - { - "params": [], - "type": "non_negative_difference" - } - ] - ], - "tags": [ - { - "key": "cluster_name", - "operator": "=", - "value": "$cluster_name" - } - ] - }, - { - "alias": "geoip_time", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - } - ], - "hide": false, - "measurement": "elasticsearch_clusterstats_nodes", - "orderByTime": "ASC", - "policy": "default", - "query": "SELECT non_negative_difference(mode(\"ingest_processor_stats_date_index_name_time_in_millis\")) FROM \"elasticsearch_clusterstats_nodes\" WHERE (\"cluster_name\" = '$cluster_name') AND $timeFilter GROUP BY time($__interval) fill(linear)", - "queryType": "randomWalk", - "rawQuery": false, - "refId": "K", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "ingest_processor_stats_geoip_time_in_millis" - ], - "type": "field" - }, - { - "params": [], - "type": "last" - }, - { - "params": [], - "type": "non_negative_difference" - } - ] - ], - "tags": [ - { - "key": "cluster_name", - "operator": "=", - "value": "$cluster_name" - } - ] - }, - { - "alias": "grok_time", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - } - ], - "hide": false, - "measurement": "elasticsearch_clusterstats_nodes", - "orderByTime": "ASC", - "policy": "default", - "query": "SELECT non_negative_difference(mode(\"ingest_processor_stats_date_index_name_time_in_millis\")) FROM \"elasticsearch_clusterstats_nodes\" WHERE (\"cluster_name\" = '$cluster_name') AND $timeFilter GROUP BY time($__interval) fill(linear)", - "queryType": "randomWalk", - "rawQuery": false, - "refId": "L", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "ingest_processor_stats_grok_time_in_millis" - ], - "type": "field" - }, - { - "params": [], - "type": "last" - }, - { - "params": [], - "type": "non_negative_difference" - } - ] - ], - "tags": [ - { - "key": "cluster_name", - "operator": "=", - "value": "$cluster_name" - } - ] - }, - { - "alias": "json_time", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - } - ], - "hide": false, - "measurement": "elasticsearch_clusterstats_nodes", - "orderByTime": "ASC", - "policy": "default", - "query": "SELECT non_negative_difference(mode(\"ingest_processor_stats_date_index_name_time_in_millis\")) FROM \"elasticsearch_clusterstats_nodes\" WHERE (\"cluster_name\" = '$cluster_name') AND $timeFilter GROUP BY time($__interval) fill(linear)", - "queryType": "randomWalk", - "rawQuery": false, - "refId": "O", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "ingest_processor_stats_json_time_in_millis" - ], - "type": "field" - }, - { - "params": [], - "type": "last" - }, - { - "params": [], - "type": "non_negative_difference" - } - ] - ], - "tags": [ - { - "key": "cluster_name", - "operator": "=", - "value": "$cluster_name" - } - ] - }, - { - "alias": "kv_time", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - } - ], - "hide": false, - "measurement": "elasticsearch_clusterstats_nodes", - "orderByTime": "ASC", - "policy": "default", - "query": "SELECT non_negative_difference(mode(\"ingest_processor_stats_date_index_name_time_in_millis\")) FROM \"elasticsearch_clusterstats_nodes\" WHERE (\"cluster_name\" = '$cluster_name') AND $timeFilter GROUP BY time($__interval) fill(linear)", - "queryType": "randomWalk", - "rawQuery": false, - "refId": "P", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "ingest_processor_stats_kv_time_in_millis" - ], - "type": "field" - }, - { - "params": [], - "type": "last" - }, - { - "params": [], - "type": "non_negative_difference" - } - ] - ], - "tags": [ - { - "key": "cluster_name", - "operator": "=", - "value": "$cluster_name" - } - ] - }, - { - "alias": "lowercase_time", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - } - ], - "hide": false, - "measurement": "elasticsearch_clusterstats_nodes", - "orderByTime": "ASC", - "policy": "default", - "query": "SELECT non_negative_difference(mode(\"ingest_processor_stats_date_index_name_time_in_millis\")) FROM \"elasticsearch_clusterstats_nodes\" WHERE (\"cluster_name\" = '$cluster_name') AND $timeFilter GROUP BY time($__interval) fill(linear)", - "queryType": "randomWalk", - "rawQuery": false, - "refId": "Q", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "ingest_processor_stats_lowercase_time_in_millis" - ], - "type": "field" - }, - { - "params": [], - "type": "last" - }, - { - "params": [], - "type": "non_negative_difference" - } - ] - ], - "tags": [ - { - "key": "cluster_name", - "operator": "=", - "value": "$cluster_name" - } - ] - }, - { - "alias": "remove_time", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - } - ], - "hide": false, - "measurement": "elasticsearch_clusterstats_nodes", - "orderByTime": "ASC", - "policy": "default", - "query": "SELECT non_negative_difference(mode(\"ingest_processor_stats_date_index_name_time_in_millis\")) FROM \"elasticsearch_clusterstats_nodes\" WHERE (\"cluster_name\" = '$cluster_name') AND $timeFilter GROUP BY time($__interval) fill(linear)", - "queryType": "randomWalk", - "rawQuery": false, - "refId": "R", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "ingest_processor_stats_remove_time_in_millis" - ], - "type": "field" - }, - { - "params": [], - "type": "last" - }, - { - "params": [], - "type": "non_negative_difference" - } - ] - ], - "tags": [ - { - "key": "cluster_name", - "operator": "=", - "value": "$cluster_name" - } - ] - }, - { - "alias": "rename_time", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - } - ], - "hide": false, - "measurement": "elasticsearch_clusterstats_nodes", - "orderByTime": "ASC", - "policy": "default", - "query": "SELECT non_negative_difference(mode(\"ingest_processor_stats_date_index_name_time_in_millis\")) FROM \"elasticsearch_clusterstats_nodes\" WHERE (\"cluster_name\" = '$cluster_name') AND $timeFilter GROUP BY time($__interval) fill(linear)", - "queryType": "randomWalk", - "rawQuery": false, - "refId": "S", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "ingest_processor_stats_rename_time_in_millis" - ], - "type": "field" - }, - { - "params": [], - "type": "last" - }, - { - "params": [], - "type": "non_negative_difference" - } - ] - ], - "tags": [ - { - "key": "cluster_name", - "operator": "=", - "value": "$cluster_name" - } - ] - }, - { - "alias": "script_time", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - } - ], - "hide": false, - "measurement": "elasticsearch_clusterstats_nodes", - "orderByTime": "ASC", - "policy": "default", - "query": "SELECT non_negative_difference(mode(\"ingest_processor_stats_date_index_name_time_in_millis\")) FROM \"elasticsearch_clusterstats_nodes\" WHERE (\"cluster_name\" = '$cluster_name') AND $timeFilter GROUP BY time($__interval) fill(linear)", - "queryType": "randomWalk", - "rawQuery": false, - "refId": "T", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "ingest_processor_stats_script_time_in_millis" - ], - "type": "field" - }, - { - "params": [], - "type": "last" - }, - { - "params": [], - "type": "non_negative_difference" - } - ] - ], - "tags": [ - { - "key": "cluster_name", - "operator": "=", - "value": "$cluster_name" - } - ] - }, - { - "alias": "url_decodes", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - } - ], - "hide": false, - "measurement": "elasticsearch_clusterstats_nodes", - "orderByTime": "ASC", - "policy": "default", - "query": "SELECT non_negative_difference(mode(\"ingest_processor_stats_date_index_name_time_in_millis\")) FROM \"elasticsearch_clusterstats_nodes\" WHERE (\"cluster_name\" = '$cluster_name') AND $timeFilter GROUP BY time($__interval) fill(linear)", - "queryType": "randomWalk", - "rawQuery": false, - "refId": "U", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "ingest_processor_stats_user_agent_time_in_millis" - ], - "type": "field" - }, - { - "params": [], - "type": "last" - }, - { - "params": [], - "type": "non_negative_difference" - } - ] - ], - "tags": [ - { - "key": "cluster_name", - "operator": "=", - "value": "$cluster_name" - } - ] - } - ], - "fieldConfig": { - "defaults": { - "custom": { - "drawStyle": "line", - "lineInterpolation": "linear", - "barAlignment": 0, - "lineWidth": 1, - "fillOpacity": 10, - "gradientMode": "none", - "spanNulls": false, - "showPoints": "never", - "pointSize": 5, - "stacking": { - "mode": "none", - "group": "A" - }, - "axisPlacement": "auto", - "axisLabel": "", - "scaleDistribution": { - "type": "linear" - }, - "hideFrom": { - "tooltip": false, - "viz": false, - "legend": false - }, - "thresholdsStyle": { - "mode": "off" - } - }, - "color": { - "mode": "palette-classic" - }, - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green", - "value": null - } - ] - }, - "mappings": [], - "unit": "ms" - }, - "overrides": [] - }, - "description": "", - "timeFrom": null, - "timeShift": null -} diff --git a/salt/grafana/panels/elasticsearch_pipeline_time_nontc_graph.json.jinja b/salt/grafana/panels/elasticsearch_pipeline_time_nontc_graph.json.jinja deleted file mode 100644 index 2920ef314..000000000 --- a/salt/grafana/panels/elasticsearch_pipeline_time_nontc_graph.json.jinja +++ /dev/null @@ -1,153 +0,0 @@ -{ - "id": 445552, - "gridPos": { - "x": {{ PANELS.elasticsearch_pipeline_time_nontc_graph.gridPos.x }}, - "y": {{ PANELS.elasticsearch_pipeline_time_nontc_graph.gridPos.y }}, - "w": {{ PANELS.elasticsearch_pipeline_time_nontc_graph.gridPos.w }}, - "h": {{ PANELS.elasticsearch_pipeline_time_nontc_graph.gridPos.h }} - }, - "type": "timeseries", - "title": "Pipeline Time", - "datasource": "InfluxDB", - "interval": "30s", - "fieldConfig": { - "defaults": { - "custom": { - "drawStyle": "line", - "lineInterpolation": "linear", - "barAlignment": 0, - "lineWidth": 1, - "fillOpacity": 0, - "gradientMode": "none", - "spanNulls": false, - "showPoints": "never", - "pointSize": 5, - "stacking": { - "mode": "none", - "group": "A" - }, - "axisPlacement": "auto", - "axisLabel": "", - "scaleDistribution": { - "type": "linear" - }, - "hideFrom": { - "tooltip": false, - "viz": false, - "legend": false - }, - "thresholdsStyle": { - "mode": "off" - } - }, - "color": { - "mode": "palette-classic" - }, - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green", - "value": null - } - ] - }, - "mappings": [], - "unit": "ms" - }, - "overrides": [] - }, - "options": { - "tooltip": { - "mode": "multi" - }, - "legend": { - "displayMode": "table", - "placement": "right", - "calcs": [ - "max", - "mean" - ] - } - }, - "targets": [ - { - "alias": "$tag_host", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "host" - ], - "type": "tag" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "measurement": "elasticsearch_clusterstats_nodes", - "orderByTime": "ASC", - "policy": "default", - "refId": "A", - "resultFormat": "time_series", - "select": [ - [ - { - "type": "field", - "params": [ - "ingest_processor_stats_pipeline_time_in_millis" - ] - }, - { - "type": "mean", - "params": [] - }, - { - "type": "non_negative_difference", - "params": [] - } - ] - ], - "tags": [ - { - "key": "role", - "operator": "=~", - "value": "/search/" - }, - { - "key": "role", - "value": "heavynode", - "operator": "=", - "condition": "OR" - }, - { - "key": "role", - "value": "standalone", - "operator": "=", - "condition": "OR" - }, - { - "key": "role", - "value": "eval", - "operator": "=", - "condition": "OR" - } - ] - } - ] -} - - - - - - - diff --git a/salt/grafana/panels/elasticsearch_pipeline_time_tc_graph.json.jinja b/salt/grafana/panels/elasticsearch_pipeline_time_tc_graph.json.jinja deleted file mode 100644 index 42ac51038..000000000 --- a/salt/grafana/panels/elasticsearch_pipeline_time_tc_graph.json.jinja +++ /dev/null @@ -1,129 +0,0 @@ -{ - "id": 445552, - "gridPos": { - "x": {{ PANELS.elasticsearch_pipeline_time_tc_graph.gridPos.x }}, - "y": {{ PANELS.elasticsearch_pipeline_time_tc_graph.gridPos.y }}, - "w": {{ PANELS.elasticsearch_pipeline_time_tc_graph.gridPos.w }}, - "h": {{ PANELS.elasticsearch_pipeline_time_tc_graph.gridPos.h }} - }, - "type": "timeseries", - "title": "Pipeline Time", - "datasource": "InfluxDB", - "interval": "30s", - "fieldConfig": { - "defaults": { - "custom": { - "drawStyle": "line", - "lineInterpolation": "linear", - "barAlignment": 0, - "lineWidth": 1, - "fillOpacity": 0, - "gradientMode": "none", - "spanNulls": false, - "showPoints": "never", - "pointSize": 5, - "stacking": { - "mode": "none", - "group": "A" - }, - "axisPlacement": "auto", - "axisLabel": "", - "scaleDistribution": { - "type": "linear" - }, - "hideFrom": { - "tooltip": false, - "viz": false, - "legend": false - }, - "thresholdsStyle": { - "mode": "off" - } - }, - "color": { - "mode": "palette-classic" - }, - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green", - "value": null - } - ] - }, - "mappings": [], - "unit": "ms" - }, - "overrides": [] - }, - "options": { - "tooltip": { - "mode": "multi" - }, - "legend": { - "displayMode": "table", - "placement": "right", - "calcs": [ - "max", - "mean" - ] - } - }, - "targets": [ - { - "alias": "Time", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "measurement": "elasticsearch_clusterstats_nodes", - "orderByTime": "ASC", - "policy": "default", - "refId": "A", - "resultFormat": "time_series", - "select": [ - [ - { - "type": "field", - "params": [ - "ingest_processor_stats_pipeline_time_in_millis" - ] - }, - { - "type": "mean", - "params": [] - }, - { - "type": "non_negative_difference", - "params": [] - } - ] - ], - "tags": [ - { - "key": "cluster_name", - "operator": "=", - "value": "$cluster_name" - } - ] - } - ] -} - - - - - - - diff --git a/salt/grafana/panels/elasticsearch_store_size_graph.json.jinja b/salt/grafana/panels/elasticsearch_store_size_graph.json.jinja deleted file mode 100644 index 554809b5c..000000000 --- a/salt/grafana/panels/elasticsearch_store_size_graph.json.jinja +++ /dev/null @@ -1,195 +0,0 @@ -{ - "aliasColors": {}, - "bars": false, - "maxDataPoints": 750, - "interval": "30s", - "cacheTimeout": null, - "dashLength": 10, - "dashes": false, - "datasource": "InfluxDB", - "fieldConfig": { - "defaults": { - "links": [] - }, - "overrides": [] - }, - "fill": 1, - "fillGradient": 0, - "gridPos": { - "x": {{ PANELS.elasticsearch_store_size_graph.gridPos.x }}, - "y": {{ PANELS.elasticsearch_store_size_graph.gridPos.y }}, - "w": {{ PANELS.elasticsearch_store_size_graph.gridPos.w }}, - "h": {{ PANELS.elasticsearch_store_size_graph.gridPos.h }} - }, - "hiddenSeries": false, - "id": 63442, - "legend": { - "alignAsTable": true, - "avg": false, - "current": true, - "hideEmpty": true, - "max": false, - "min": false, - "rightSide": false, - "show": true, - "sort": "current", - "sortDesc": true, - "total": false, - "values": true - }, - "lines": true, - "linewidth": 1, - "links": [], - "nullPointMode": "connected", - "options": { - "alertThreshold": true - }, - "percentage": false, - "pluginVersion": "7.5.4", - "pointradius": 2, - "points": false, - "renderer": "flot", - "seriesOverrides": [ - { - "alias": "/Trend/", - "dashLength": 4, - "dashes": true, - "fill": 0, - "linewidth": 4 - } - ], - "spaceLength": 10, - "stack": false, - "steppedLine": false, - "targets": [ - { - "alias": "Size Current", - "dsType": "influxdb", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "measurement": "elasticsearch_indices", - "orderByTime": "ASC", - "policy": "default", - "refId": "A", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "store_size_in_bytes" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], - "tags": [ - { - "key": "host", - "operator": "=", - "value": "$servername" - } - ] - }, - { - "alias": "Size Trend", - "dsType": "influxdb", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "hide": false, - "measurement": "elasticsearch_indices", - "orderByTime": "ASC", - "policy": "so_long_term", - "refId": "B", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "mean_store_size_in_bytes" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], - "tags": [ - { - "key": "host", - "operator": "=", - "value": "$servername" - } - ] - } - ], - "thresholds": [], - "timeFrom": null, - "timeRegions": [], - "timeShift": null, - "title": "Store Size", - "tooltip": { - "shared": true, - "sort": 0, - "value_type": "individual" - }, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "format": "decbytes", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - }, - { - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": false - } - ], - "yaxis": { - "align": false, - "alignLevel": null - } -} diff --git a/salt/grafana/panels/elasticsearch_thread_count_graph.json.jinja b/salt/grafana/panels/elasticsearch_thread_count_graph.json.jinja deleted file mode 100644 index e1d8edd98..000000000 --- a/salt/grafana/panels/elasticsearch_thread_count_graph.json.jinja +++ /dev/null @@ -1,192 +0,0 @@ -{ - "aliasColors": {}, - "bars": false, - "maxDataPoints": 750, - "interval": "30s", - "dashLength": 10, - "dashes": false, - "datasource": "InfluxDB", - "fieldConfig": { - "defaults": { - "links": [] - }, - "overrides": [] - }, - "fill": 1, - "fillGradient": 0, - "gridPos": { - "x": {{ PANELS.elasticsearch_thread_count_graph.gridPos.x }}, - "y": {{ PANELS.elasticsearch_thread_count_graph.gridPos.y }}, - "w": {{ PANELS.elasticsearch_thread_count_graph.gridPos.w }}, - "h": {{ PANELS.elasticsearch_thread_count_graph.gridPos.h }} - }, - "hiddenSeries": false, - "id": 56565, - "legend": { - "alignAsTable": true, - "avg": true, - "current": true, - "hideEmpty": true, - "max": true, - "min": false, - "rightSide": false, - "show": true, - "sort": "current", - "sortDesc": true, - "total": false, - "values": true - }, - "lines": true, - "linewidth": 1, - "nullPointMode": "connected", - "options": { - "alertThreshold": true - }, - "percentage": false, - "pluginVersion": "7.5.4", - "pointradius": 2, - "points": false, - "renderer": "flot", - "seriesOverrides": [ - { - "alias": "/Trend/", - "dashLength": 4, - "dashes": true, - "fill": 0, - "linewidth": 4 - } - ], - "spaceLength": 10, - "stack": false, - "steppedLine": false, - "targets": [ - { - "alias": "Count Current", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "measurement": "elasticsearch_jvm", - "orderByTime": "ASC", - "policy": "default", - "refId": "A", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "threads_count" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], - "tags": [ - { - "key": "host", - "operator": "=", - "value": "$servername" - } - ] - }, - { - "alias": "Count Trend", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "hide": false, - "measurement": "elasticsearch_jvm", - "orderByTime": "ASC", - "policy": "so_long_term", - "refId": "B", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "mean_threads_count" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], - "tags": [ - { - "key": "host", - "operator": "=", - "value": "$servername" - } - ] - } - ], - "thresholds": [], - "timeFrom": null, - "timeRegions": [], - "timeShift": null, - "title": "Thread Count", - "tooltip": { - "shared": true, - "sort": 0, - "value_type": "individual" - }, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "decimals": 0, - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - }, - { - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": false - } - ], - "yaxis": { - "align": false, - "alignLevel": null - } -} diff --git a/salt/grafana/panels/influxdb_db_size_graph.json.jinja b/salt/grafana/panels/influxdb_db_size_graph.json.jinja deleted file mode 100644 index 71d636fe9..000000000 --- a/salt/grafana/panels/influxdb_db_size_graph.json.jinja +++ /dev/null @@ -1,191 +0,0 @@ -{ - "aliasColors": {}, - "bars": false, - "maxDataPoints": 750, - "interval": "30s", - "dashLength": 10, - "dashes": false, - "datasource": "InfluxDB", - "fieldConfig": { - "defaults": { - "links": [] - }, - "overrides": [] - }, - "fill": 1, - "fillGradient": 0, - "gridPos": { - "x": {{ PANELS.influxdb_db_size_graph.gridPos.x }}, - "y": {{ PANELS.influxdb_db_size_graph.gridPos.y }}, - "w": {{ PANELS.influxdb_db_size_graph.gridPos.w }}, - "h": {{ PANELS.influxdb_db_size_graph.gridPos.h }} - }, - "hiddenSeries": false, - "id": 69, - "legend": { - "alignAsTable": true, - "avg": true, - "current": true, - "hideEmpty": true, - "max": true, - "min": false, - "rightSide": false, - "show": true, - "sort": "current", - "sortDesc": true, - "total": false, - "values": true - }, - "lines": true, - "linewidth": 1, - "nullPointMode": "connected", - "options": { - "alertThreshold": true - }, - "percentage": false, - "pluginVersion": "7.5.4", - "pointradius": 2, - "points": false, - "renderer": "flot", - "seriesOverrides": [ - { - "alias": "/Trend/", - "dashLength": 4, - "dashes": true, - "fill": 0, - "linewidth": 4 - } - ], - "spaceLength": 10, - "stack": false, - "steppedLine": false, - "targets": [ - { - "alias": "Size Current", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "measurement": "influxsize", - "orderByTime": "ASC", - "policy": "default", - "refId": "A", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "kbytes" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], - "tags": [ - { - "key": "host", - "operator": "=", - "value": "$servername" - } - ] - }, - { - "alias": "Size Trend", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "hide": false, - "measurement": "influxsize", - "orderByTime": "ASC", - "policy": "so_long_term", - "refId": "B", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "mean_kbytes" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], - "tags": [ - { - "key": "host", - "operator": "=", - "value": "$servername" - } - ] - } - ], - "thresholds": [], - "timeFrom": null, - "timeRegions": [], - "timeShift": null, - "title": "InfluxDB Database Size", - "tooltip": { - "shared": true, - "sort": 0, - "value_type": "individual" - }, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "format": "deckbytes", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - }, - { - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": false - } - ], - "yaxis": { - "align": false, - "alignLevel": null - } -} diff --git a/salt/grafana/panels/io_wait_graph.json.jinja b/salt/grafana/panels/io_wait_graph.json.jinja deleted file mode 100644 index 9447563ec..000000000 --- a/salt/grafana/panels/io_wait_graph.json.jinja +++ /dev/null @@ -1,148 +0,0 @@ -{ - "id": 69011, - "gridPos": { - "x": {{ PANELS.io_wait_graph.gridPos.x }}, - "y": {{ PANELS.io_wait_graph.gridPos.y }}, - "w": {{ PANELS.io_wait_graph.gridPos.w }}, - "h": {{ PANELS.io_wait_graph.gridPos.h }} - }, - "type": "timeseries", - "title": "IO Wait", - "datasource": "InfluxDB", - "pluginVersion": "8.2.1", - "fieldConfig": { - "defaults": { - "custom": { - "drawStyle": "line", - "lineInterpolation": "linear", - "barAlignment": 0, - "lineWidth": 1, - "fillOpacity": 0, - "gradientMode": "none", - "spanNulls": false, - "showPoints": "never", - "pointSize": 5, - "stacking": { - "mode": "none", - "group": "A" - }, - "axisPlacement": "auto", - "axisLabel": "", - "scaleDistribution": { - "type": "linear" - }, - "hideFrom": { - "tooltip": false, - "viz": false, - "legend": false - }, - "thresholdsStyle": { - "mode": "off" - } - }, - "color": { - "mode": "palette-classic" - }, - "thresholds": { - "mode": "absolute", - "steps": [ - { - "value": null, - "color": "green" - }, - { - "value": 80, - "color": "red" - } - ] - }, - "mappings": [], - "unit": "percent", - "min": 0, - "decimals": 1 - }, - "overrides": [] - }, - "options": { - "tooltip": { - "mode": "single" - }, - "legend": { - "displayMode": "table", - "placement": "right", - "calcs": [ - "max", - "mean", - "lastNotNull" - ] - } - }, - "targets": [ - { - "alias": "$tag_host $tag_role", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "host" - ], - "type": "tag" - }, - { - "params": [ - "role" - ], - "type": "tag" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "measurement": "cpu", - "orderByTime": "ASC", - "policy": "default", - "queryType": "randomWalk", - "refId": "A", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "usage_iowait" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], - "tags": [ - { - "key": "host", - "operator": "=~", - "value": "/^$servername$/" - }, - { - "condition": "AND", - "key": "cpu", - "operator": "=", - "value": "cpu-total" - } - ] - } - ], - "description": "", - "timeFrom": null, - "timeShift": null, - "interval": "30s" -} diff --git a/salt/grafana/panels/io_wait_stat.json.jinja b/salt/grafana/panels/io_wait_stat.json.jinja deleted file mode 100644 index 4fe4a3d8e..000000000 --- a/salt/grafana/panels/io_wait_stat.json.jinja +++ /dev/null @@ -1,125 +0,0 @@ -{ - "id": 61867, - "gridPos": { - "x": {{ PANELS.io_wait_stat.gridPos.x }}, - "y": {{ PANELS.io_wait_stat.gridPos.y }}, - "w": {{ PANELS.io_wait_stat.gridPos.w }}, - "h": {{ PANELS.io_wait_stat.gridPos.h }} - }, - "type": "stat", - "title": "IOWait", - "datasource": "InfluxDB", - "pluginVersion": "8.2.1", - "links": [], - "fieldConfig": { - "defaults": { - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "dark-green", - "value": null - }, - { - "color": "rgba(237, 129, 40, 0.89)", - "value": 40 - }, - { - "color": "dark-red", - "value": 50 - } - ] - }, - "mappings": [ - { - "options": { - "match": "null", - "result": { - "text": "N/A" - } - }, - "type": "special" - } - ], - "color": { - "mode": "thresholds" - }, - "decimals": 2, - "max": 100, - "min": 0, - "unit": "percent" - }, - "overrides": [] - }, - "interval": "30", - "options": { - "reduceOptions": { - "values": false, - "calcs": [ - "lastNotNull" - ], - "fields": "" - }, - "orientation": "horizontal", - "text": {}, - "textMode": "auto", - "colorMode": "value", - "graphMode": "area", - "justifyMode": "auto" - }, - "targets": [ - { - "dsType": "influxdb", - "groupBy": [ - { - "params": [ - "$interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "measurement": "cpu", - "orderByTime": "ASC", - "policy": "default", - "query": "SELECT non_negative_derivative(mean(\"usage_iowait\"), 1s) FROM \"cpu\" WHERE (host =~ /$servername$/ AND \"cpu\" = 'cpu-total') AND $timeFilter GROUP BY time($interval) fill(null)", - "rawQuery": false, - "refId": "A", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "usage_iowait" - ], - "type": "field" - }, - { - "params": [], - "type": "last" - } - ] - ], - "tags": [ - { - "key": "host", - "operator": "=", - "value": "$servername" - }, - { - "condition": "AND", - "key": "cpu", - "operator": "=", - "value": "cpu-total" - } - ] - } - ], - "maxDataPoints": null, - "cacheTimeout": null -} diff --git a/salt/grafana/panels/load_average_5_minute_stat.json.jinja b/salt/grafana/panels/load_average_5_minute_stat.json.jinja deleted file mode 100644 index 8198a8d19..000000000 --- a/salt/grafana/panels/load_average_5_minute_stat.json.jinja +++ /dev/null @@ -1,118 +0,0 @@ -{ - "id": 61859, - "gridPos": { - "x": {{ PANELS.load_average_5_minute_stat.gridPos.x }}, - "y": {{ PANELS.load_average_5_minute_stat.gridPos.y }}, - "w": {{ PANELS.load_average_5_minute_stat.gridPos.w }}, - "h": {{ PANELS.load_average_5_minute_stat.gridPos.h }} - }, - "type": "stat", - "title": "5 Minute Load Average - $cpucount Cores", - "datasource": "InfluxDB", - "pluginVersion": "8.2.1", - "interval": "30", - "links": [], - "fieldConfig": { - "defaults": { - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "rgba(50, 172, 45, 0.97)", - "value": null - }, - { - "color": "rgba(237, 129, 40, 0.89)", - "value": "$cpucount / 1.5" - }, - { - "color": "rgba(245, 54, 54, 0.9)", - "value": "$cpucount" - } - ] - }, - "mappings": [ - { - "options": { - "from": null, - "result": { - "text": "N/A" - }, - "to": null - }, - "type": "range" - } - ], - "color": { - "mode": "thresholds" - }, - "decimals": 1, - "unit": "none" - }, - "overrides": [] - }, - "options": { - "reduceOptions": { - "values": false, - "calcs": [ - "lastNotNull" - ], - "fields": "" - }, - "orientation": "horizontal", - "text": {}, - "textMode": "auto", - "colorMode": "value", - "graphMode": "area", - "justifyMode": "auto" - }, - "targets": [ - { - "dsType": "influxdb", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "measurement": "system", - "orderByTime": "ASC", - "policy": "default", - "query": "SELECT last(\"load5\") FROM \"system\" WHERE (\"host\" = '$servername') AND $timeFilter GROUP BY time($__interval) fill(null)", - "rawQuery": false, - "refId": "A", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "load5" - ], - "type": "field" - }, - { - "params": [], - "type": "last" - } - ] - ], - "tags": [ - { - "key": "host", - "operator": "=", - "value": "$servername" - } - ] - } - ], - "cacheTimeout": null, - "maxDataPoints": null -} diff --git a/salt/grafana/panels/load_averages_graph.json.jinja b/salt/grafana/panels/load_averages_graph.json.jinja deleted file mode 100644 index b92a5ba6c..000000000 --- a/salt/grafana/panels/load_averages_graph.json.jinja +++ /dev/null @@ -1,187 +0,0 @@ -{ - "id": 61869, - "gridPos": { - "x": {{ PANELS.load_averages_graph.gridPos.x }}, - "y": {{ PANELS.load_averages_graph.gridPos.y }}, - "w": {{ PANELS.load_averages_graph.gridPos.w }}, - "h": {{ PANELS.load_averages_graph.gridPos.h }} - }, - "type": "timeseries", - "title": "1 Minute Load Average", - "datasource": "InfluxDB", - "pluginVersion": "8.2.1", - "interval": "30s", - "options": { - "tooltip": { - "mode": "single" - }, - "legend": { - "displayMode": "table", - "placement": "bottom", - "calcs": [ - "max", - "mean", - "lastNotNull" - ] - } - }, - "targets": [ - { - "alias": "$tag_host: $col", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "orderByTime": "ASC", - "policy": "default", - "query": "SELECT mean(load1) as \"1 minute\", last(n_cpus) as \"Total Cores\" FROM \"system\" WHERE host =~ /$servername$/ AND $timeFilter GROUP BY time($__interval), * ORDER BY asc", - "queryType": "randomWalk", - "rawQuery": true, - "refId": "A", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "value" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], - "tags": [] - }, - { - "alias": "$tag_host: $col", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "hide": false, - "orderByTime": "ASC", - "policy": "default", - "query": "SELECT mean(mean_load1) as \"trend_1 minute\" FROM \"so_long_term\".\"system\" WHERE host =~ /$servername$/ AND $timeFilter GROUP BY time($__interval), * fill(linear) ORDER BY asc", - "queryType": "randomWalk", - "rawQuery": true, - "refId": "B", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "value" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], - "tags": [] - } - ], - "fieldConfig": { - "defaults": { - "custom": { - "drawStyle": "line", - "lineInterpolation": "linear", - "barAlignment": 0, - "lineWidth": 1, - "fillOpacity": 0, - "gradientMode": "none", - "spanNulls": false, - "showPoints": "never", - "pointSize": 5, - "stacking": { - "mode": "none", - "group": "A" - }, - "axisPlacement": "auto", - "axisLabel": "", - "scaleDistribution": { - "type": "linear" - }, - "hideFrom": { - "tooltip": false, - "viz": false, - "legend": false - }, - "thresholdsStyle": { - "mode": "off" - } - }, - "color": { - "mode": "palette-classic" - }, - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green", - "value": null - } - ] - }, - "mappings": [], - "unit": "short", - "decimals": 1 - }, - "overrides": [ - { - "matcher": { - "id": "byRegexp", - "options": "/trend/" - }, - "properties": [ - { - "id": "custom.fillOpacity", - "value": 0 - }, - { - "id": "custom.lineWidth", - "value": 4 - }, - { - "id": "custom.lineStyle", - "value": { - "fill": "dash", - "dash": [ - 4, - 10 - ] - } - } - ] - } - ] - }, - "maxDataPoints": null, - "timeFrom": null, - "timeShift": null -} diff --git a/salt/grafana/panels/logstash_eps_in_out_manager_graph.json.jinja b/salt/grafana/panels/logstash_eps_in_out_manager_graph.json.jinja deleted file mode 100644 index 7812ca0bd..000000000 --- a/salt/grafana/panels/logstash_eps_in_out_manager_graph.json.jinja +++ /dev/null @@ -1,403 +0,0 @@ -{ - "id": 77741, - "gridPos": { - "x": {{ PANELS.logstash_eps_in_out_manager_graph.gridPos.x }}, - "y": {{ PANELS.logstash_eps_in_out_manager_graph.gridPos.y }}, - "w": {{ PANELS.logstash_eps_in_out_manager_graph.gridPos.w }}, - "h": {{ PANELS.logstash_eps_in_out_manager_graph.gridPos.h }} - }, - "type": "timeseries", - "title": "Manager Logstash Events", - "datasource": "InfluxDB", - "pluginVersion": "8.2.1", - "interval": "30s", - "description": "Events from the grid to redis", - "fieldConfig": { - "defaults": { - "custom": { - "drawStyle": "line", - "lineInterpolation": "linear", - "barAlignment": 0, - "lineWidth": 1, - "fillOpacity": 50, - "gradientMode": "none", - "spanNulls": false, - "showPoints": "never", - "pointSize": 5, - "stacking": { - "mode": "none", - "group": "A" - }, - "axisPlacement": "auto", - "axisLabel": "EPS", - "scaleDistribution": { - "type": "linear" - }, - "hideFrom": { - "tooltip": false, - "viz": false, - "legend": false - }, - "thresholdsStyle": { - "mode": "off" - } - }, - "color": { - "mode": "palette-classic" - }, - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green", - "value": null - } - ] - }, - "mappings": [], - "decimals": 2, - "unit": "short" - }, - "overrides": [ - { - "matcher": { - "id": "byRegexp", - "options": "/Incoming/" - }, - "properties": [ - { - "id": "color", - "value": { - "fixedColor": "orange", - "mode": "fixed" - } - } - ] - }, - { - "matcher": { - "id": "byRegexp", - "options": "/Outgoing/" - }, - "properties": [ - { - "id": "color", - "value": { - "fixedColor": "green", - "mode": "fixed" - } - } - ] - }, - { - "matcher": { - "id": "byName", - "options": "Incoming hidden" - }, - "properties": [ - { - "id": "custom.fillBelowTo", - "value": "Outgoing hidden" - } - ] - }, - { - "matcher": { - "id": "byName", - "options": "Outgoing hidden" - }, - "properties": [ - { - "id": "custom.fillBelowTo", - "value": "Incoming hidden" - } - ] - }, - { - "matcher": { - "id": "byName", - "options": "Incoming" - }, - "properties": [ - { - "id": "custom.fillOpacity", - "value": 0 - } - ] - }, - { - "matcher": { - "id": "byName", - "options": "Outgoing" - }, - "properties": [ - { - "id": "custom.fillOpacity", - "value": 0 - } - ] - }, - { - "matcher": { - "id": "byRegexp", - "options": "/hidden/" - }, - "properties": [ - { - "id": "custom.hideFrom", - "value": { - "legend": true, - "tooltip": true, - "viz": false - } - } - ] - } - ] - }, - "options": { - "tooltip": { - "mode": "multi" - }, - "legend": { - "displayMode": "table", - "placement": "bottom", - "calcs": [ - "max", - "mean" - ] - } - }, - "targets": [ - { - "alias": "Incoming", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - } - ], - "hide": false, - "measurement": "logstash_events", - "orderByTime": "ASC", - "policy": "default", - "queryType": "randomWalk", - "refId": "A", - "resultFormat": "time_series", - "select": [ - [ - { - "type": "field", - "params": [ - "in" - ] - }, - { - "type": "mean", - "params": [] - }, - { - "type": "non_negative_derivative", - "params": [ - "1s" - ] - } - ] - ], - "tags": [ - { - "key": "role", - "operator": "=~", - "value": "/^manager/" - }, - { - "key": "role", - "value": "standalone", - "operator": "=", - "condition": "OR" - }, - { - "key": "role", - "value": "eval", - "operator": "=", - "condition": "OR" - } - ] - }, - { - "alias": "Outgoing", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - } - ], - "hide": false, - "measurement": "logstash_events", - "orderByTime": "ASC", - "policy": "default", - "queryType": "randomWalk", - "refId": "B", - "resultFormat": "time_series", - "select": [ - [ - { - "type": "field", - "params": [ - "out" - ] - }, - { - "type": "mean", - "params": [] - }, - { - "type": "non_negative_derivative", - "params": [ - "1s" - ] - } - ] - ], - "tags": [ - { - "key": "role", - "operator": "=~", - "value": "/^manager/" - }, - { - "key": "role", - "value": "standalone", - "operator": "=", - "condition": "OR" - }, - { - "key": "role", - "value": "eval", - "operator": "=", - "condition": "OR" - } - ] - }, - { - "alias": "Incoming hidden", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - } - ], - "hide": false, - "measurement": "logstash_events", - "orderByTime": "ASC", - "policy": "default", - "queryType": "randomWalk", - "refId": "C", - "resultFormat": "time_series", - "select": [ - [ - { - "type": "field", - "params": [ - "in" - ] - }, - { - "type": "mean", - "params": [] - }, - { - "type": "non_negative_derivative", - "params": [ - "1s" - ] - } - ] - ], - "tags": [ - { - "key": "role", - "operator": "=~", - "value": "/^manager/" - }, - { - "key": "role", - "value": "standalone", - "operator": "=", - "condition": "OR" - }, - { - "key": "role", - "value": "eval", - "operator": "=", - "condition": "OR" - } - ] - }, - { - "alias": "Outgoing hidden", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - } - ], - "hide": false, - "measurement": "logstash_events", - "orderByTime": "ASC", - "policy": "default", - "queryType": "randomWalk", - "refId": "D", - "resultFormat": "time_series", - "select": [ - [ - { - "type": "field", - "params": [ - "out" - ] - }, - { - "type": "mean", - "params": [] - }, - { - "type": "non_negative_derivative", - "params": [ - "1s" - ] - } - ] - ], - "tags": [ - { - "key": "role", - "operator": "=~", - "value": "/^manager/" - }, - { - "key": "role", - "value": "standalone", - "operator": "=", - "condition": "OR" - }, - { - "key": "role", - "value": "eval", - "operator": "=", - "condition": "OR" - } - ] - } - ], - "timeFrom": null, - "timeShift": null -} diff --git a/salt/grafana/panels/logstash_estimated_eps_in_graph.json.jinja b/salt/grafana/panels/logstash_estimated_eps_in_graph.json.jinja deleted file mode 100644 index c1c9ed39a..000000000 --- a/salt/grafana/panels/logstash_estimated_eps_in_graph.json.jinja +++ /dev/null @@ -1,230 +0,0 @@ -{ - "id": 76, - "gridPos": { - "x": {{ PANELS.logstash_estimated_eps_in_graph.gridPos.x }}, - "y": {{ PANELS.logstash_estimated_eps_in_graph.gridPos.y }}, - "w": {{ PANELS.logstash_estimated_eps_in_graph.gridPos.w }}, - "h": {{ PANELS.logstash_estimated_eps_in_graph.gridPos.h }} - }, - "type": "timeseries", - "title": "Estimated EPS In", - "datasource": "InfluxDB", - "pluginVersion": "8.2.1", - "interval": "30s", - "fieldConfig": { - "defaults": { - "custom": { - "drawStyle": "line", - "lineInterpolation": "linear", - "barAlignment": 0, - "lineWidth": 1, - "fillOpacity": 10, - "gradientMode": "none", - "spanNulls": false, - "showPoints": "never", - "pointSize": 5, - "stacking": { - "mode": "none", - "group": "A" - }, - "axisPlacement": "auto", - "axisLabel": "EPS", - "scaleDistribution": { - "type": "linear" - }, - "hideFrom": { - "tooltip": false, - "viz": false, - "legend": false - }, - "thresholdsStyle": { - "mode": "off" - } - }, - "color": { - "mode": "palette-classic" - }, - "thresholds": { - "mode": "absolute", - "steps": [ - { - "value": null, - "color": "green" - }, - { - "value": 80, - "color": "red" - } - ] - }, - "mappings": [], - "unit": "short", - "decimals": 1 - }, - "overrides": [ - { - "matcher": { - "id": "byRegexp", - "options": "/trend/" - }, - "properties": [ - { - "id": "custom.fillOpacity", - "value": 0 - }, - { - "id": "custom.lineWidth", - "value": 4 - }, - { - "id": "custom.lineStyle", - "value": { - "fill": "dash", - "dash": [ - 4, - 10 - ] - } - } - ] - } - ] - }, - "options": { - "tooltip": { - "mode": "single" - }, - "legend": { - "displayMode": "table", - "placement": "right", - "calcs": [ - "max", - "mean", - "lastNotNull" - ] - } - }, - "targets": [ - { - "refId": "A", - "hide": false, - "policy": "default", - "resultFormat": "time_series", - "orderByTime": "ASC", - "tags": [ - { - "key": "host", - "value": "/^$servername$/", - "operator": "=~" - } - ], - "groupBy": [ - { - "type": "time", - "params": [ - "$__interval" - ] - }, - { - "type": "tag", - "params": [ - "host" - ] - }, - { - "type": "fill", - "params": [ - "null" - ] - } - ], - "select": [ - [ - { - "type": "field", - "params": [ - "in" - ] - }, - { - "type": "mean", - "params": [] - }, - { - "type": "non_negative_derivative", - "params": [ - "1s" - ] - } - ] - ], - "measurement": "logstash_events", - "alias": "$tag_host: $col", - "query": "SELECT non_negative_derivative(mean(\"in\"), 1s) as \"current_in\" FROM \"logstash_events\" WHERE (\"host\" =~ /^$servername$/) AND $timeFilter GROUP BY time($__interval), \"host\" fill(null)", - "rawQuery": true - }, - { - "refId": "B", - "hide": false, - "policy": "so_long_term", - "resultFormat": "time_series", - "orderByTime": "ASC", - "tags": [ - { - "key": "host", - "value": "/^$servername$/", - "operator": "=~" - } - ], - "groupBy": [ - { - "type": "time", - "params": [ - "$__interval" - ] - }, - { - "type": "tag", - "params": [ - "host" - ] - }, - { - "type": "fill", - "params": [ - "null" - ] - } - ], - "select": [ - [ - { - "type": "field", - "params": [ - "mean_in" - ] - }, - { - "type": "mean", - "params": [] - }, - { - "type": "non_negative_derivative", - "params": [ - "1s" - ] - } - ] - ], - "measurement": "logstash_events", - "alias": "$tag_host: $col", - "query": "SELECT non_negative_derivative(mean(\"mean_in\"), 1s) as \"trend_in\" FROM \"so_long_term\".\"logstash_events\" WHERE (\"host\" =~ /^$servername$/) AND $timeFilter GROUP BY time($__interval), \"host\" fill(null)", - "rawQuery": true - } - ], - "maxDataPoints": null, - "description": "", - "timeFrom": null, - "timeShift": null, - "transformations": [] -} diff --git a/salt/grafana/panels/logstash_estimated_eps_in_stat.json.jinja b/salt/grafana/panels/logstash_estimated_eps_in_stat.json.jinja deleted file mode 100644 index f492dd4b9..000000000 --- a/salt/grafana/panels/logstash_estimated_eps_in_stat.json.jinja +++ /dev/null @@ -1,136 +0,0 @@ -{ - "id": 23, - "gridPos": { - "x": {{ PANELS.logstash_estimated_eps_in_stat.gridPos.x }}, - "y": {{ PANELS.logstash_estimated_eps_in_stat.gridPos.y }}, - "w": {{ PANELS.logstash_estimated_eps_in_stat.gridPos.w }}, - "h": {{ PANELS.logstash_estimated_eps_in_stat.gridPos.h }} - }, - "type": "stat", - "title": "Estimated EPS In - Selected Total", - "datasource": "InfluxDB", - "pluginVersion": "8.2.1", - "interval": "30s", - "links": [], - "fieldConfig": { - "defaults": { - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "dark-red", - "value": null - }, - { - "color": "dark-green", - "value": 1 - } - ] - }, - "mappings": [ - { - "type": "special", - "options": { - "match": "null", - "result": { - "text": "N/A" - } - } - } - ], - "color": { - "mode": "thresholds" - }, - "decimals": 0, - "unit": "short" - }, - "overrides": [] - }, - "options": { - "reduceOptions": { - "values": false, - "calcs": [ - "lastNotNull" - ], - "fields": "" - }, - "orientation": "horizontal", - "text": {}, - "textMode": "value", - "colorMode": "value", - "graphMode": "area", - "justifyMode": "auto" - }, - "targets": [ - { - "refId": "A", - "hide": false, - "policy": "default", - "resultFormat": "time_series", - "orderByTime": "ASC", - "tags": [ - { - "key": "host", - "value": "/^$servername$/", - "operator": "=~" - } - ], - "groupBy": [ - { - "type": "time", - "params": [ - "$__interval" - ] - }, - { - "type": "tag", - "params": [ - "host" - ] - }, - { - "type": "fill", - "params": [ - "null" - ] - } - ], - "select": [ - [ - { - "type": "field", - "params": [ - "in" - ] - }, - { - "type": "mean", - "params": [] - }, - { - "type": "non_negative_derivative", - "params": [ - "1s" - ] - } - ] - ], - "measurement": "logstash_events" - } - ], - "transformations": [ - { - "id": "calculateField", - "options": { - "mode": "reduceRow", - "reduce": { - "reducer": "sum" - }, - "replaceFields": true - } - } - ], - "maxDataPoints": null, - "cacheTimeout": null, - "timeFrom": null -} diff --git a/salt/grafana/panels/logstash_estimated_eps_in_total_graph.json.jinja b/salt/grafana/panels/logstash_estimated_eps_in_total_graph.json.jinja deleted file mode 100644 index 42399b5ca..000000000 --- a/salt/grafana/panels/logstash_estimated_eps_in_total_graph.json.jinja +++ /dev/null @@ -1,156 +0,0 @@ -{ - "id": 69001, - "gridPos": { - "x": {{ PANELS.logstash_estimated_eps_in_total_graph.gridPos.x }}, - "y": {{ PANELS.logstash_estimated_eps_in_total_graph.gridPos.y }}, - "w": {{ PANELS.logstash_estimated_eps_in_total_graph.gridPos.w }}, - "h": {{ PANELS.logstash_estimated_eps_in_total_graph.gridPos.h }} - }, - "type": "timeseries", - "title": "Estimated EPS In - Selected Total", - "transformations": [ - { - "id": "calculateField", - "options": { - "mode": "reduceRow", - "reduce": { - "reducer": "sum" - }, - "replaceFields": true, - "alias": "Total EPS" - } - } - ], - "datasource": "InfluxDB", - "pluginVersion": "8.2.1", - "interval": "30s", - "fieldConfig": { - "defaults": { - "custom": { - "drawStyle": "line", - "lineInterpolation": "linear", - "barAlignment": 0, - "lineWidth": 1, - "fillOpacity": 10, - "gradientMode": "none", - "spanNulls": false, - "showPoints": "never", - "pointSize": 5, - "stacking": { - "mode": "none", - "group": "A" - }, - "axisPlacement": "auto", - "axisLabel": "EPS", - "scaleDistribution": { - "type": "linear" - }, - "hideFrom": { - "tooltip": false, - "viz": false, - "legend": false - }, - "thresholdsStyle": { - "mode": "off" - } - }, - "color": { - "mode": "palette-classic" - }, - "thresholds": { - "mode": "absolute", - "steps": [ - { - "value": null, - "color": "green" - }, - { - "value": 80, - "color": "red" - } - ] - }, - "mappings": [], - "unit": "short", - "decimals": 1 - }, - "overrides": [] - }, - "options": { - "tooltip": { - "mode": "single" - }, - "legend": { - "displayMode": "table", - "placement": "right", - "calcs": [ - "max", - "mean", - "lastNotNull" - ] - } - }, - "targets": [ - { - "refId": "A", - "hide": false, - "policy": "default", - "resultFormat": "time_series", - "orderByTime": "ASC", - "tags": [ - { - "key": "host", - "value": "/^$servername$/", - "operator": "=~" - } - ], - "groupBy": [ - { - "type": "time", - "params": [ - "$__interval" - ] - }, - { - "type": "tag", - "params": [ - "host" - ] - }, - { - "type": "fill", - "params": [ - "null" - ] - } - ], - "select": [ - [ - { - "type": "field", - "params": [ - "in" - ] - }, - { - "type": "mean", - "params": [] - }, - { - "type": "non_negative_derivative", - "params": [ - "1s" - ] - } - ] - ], - "measurement": "logstash_events", - "query": "SELECT non_negative_derivative(mean(\"in\"), 1s) FROM \"logstash_events\" WHERE (\"host\" =~ /^$servername$/) AND $timeFilter GROUP BY time($__interval), \"host\" fill(null)", - "rawQuery": false - } - ], - "maxDataPoints": null, - "description": "", - "timeFrom": null, - "timeShift": null -} diff --git a/salt/grafana/panels/logstash_estimated_eps_out_graph.json.jinja b/salt/grafana/panels/logstash_estimated_eps_out_graph.json.jinja deleted file mode 100644 index 16878ee6e..000000000 --- a/salt/grafana/panels/logstash_estimated_eps_out_graph.json.jinja +++ /dev/null @@ -1,230 +0,0 @@ -{ - "id": 69000, - "gridPos": { - "x": {{ PANELS.logstash_estimated_eps_out_graph.gridPos.x }}, - "y": {{ PANELS.logstash_estimated_eps_out_graph.gridPos.y }}, - "w": {{ PANELS.logstash_estimated_eps_out_graph.gridPos.w }}, - "h": {{ PANELS.logstash_estimated_eps_out_graph.gridPos.h }} - }, - "type": "timeseries", - "title": "Estimated EPS Out", - "transformations": [], - "datasource": "InfluxDB", - "pluginVersion": "8.2.1", - "interval": "30s", - "fieldConfig": { - "defaults": { - "custom": { - "drawStyle": "line", - "lineInterpolation": "linear", - "barAlignment": 0, - "lineWidth": 1, - "fillOpacity": 10, - "gradientMode": "none", - "spanNulls": false, - "showPoints": "never", - "pointSize": 5, - "stacking": { - "mode": "none", - "group": "A" - }, - "axisPlacement": "auto", - "axisLabel": "EPS", - "scaleDistribution": { - "type": "linear" - }, - "hideFrom": { - "tooltip": false, - "viz": false, - "legend": false - }, - "thresholdsStyle": { - "mode": "off" - } - }, - "color": { - "mode": "palette-classic" - }, - "thresholds": { - "mode": "absolute", - "steps": [ - { - "value": null, - "color": "green" - }, - { - "value": 80, - "color": "red" - } - ] - }, - "mappings": [], - "unit": "short", - "decimals": 1 - }, - "overrides": [ - { - "matcher": { - "id": "byRegexp", - "options": "/trend/" - }, - "properties": [ - { - "id": "custom.fillOpacity", - "value": 0 - }, - { - "id": "custom.lineWidth", - "value": 4 - }, - { - "id": "custom.lineStyle", - "value": { - "fill": "dash", - "dash": [ - 4, - 10 - ] - } - } - ] - } - ] - }, - "options": { - "tooltip": { - "mode": "single" - }, - "legend": { - "displayMode": "table", - "placement": "right", - "calcs": [ - "max", - "mean", - "lastNotNull" - ] - } - }, - "targets": [ - { - "refId": "A", - "hide": false, - "policy": "default", - "resultFormat": "time_series", - "orderByTime": "ASC", - "tags": [ - { - "key": "host", - "value": "/^$servername$/", - "operator": "=~" - } - ], - "groupBy": [ - { - "type": "time", - "params": [ - "$__interval" - ] - }, - { - "type": "tag", - "params": [ - "host" - ] - }, - { - "type": "fill", - "params": [ - "null" - ] - } - ], - "select": [ - [ - { - "type": "field", - "params": [ - "in" - ] - }, - { - "type": "mean", - "params": [] - }, - { - "type": "non_negative_derivative", - "params": [ - "1s" - ] - } - ] - ], - "measurement": "logstash_events", - "alias": "$tag_host: $col", - "query": "SELECT non_negative_derivative(mean(\"out\"), 1s) as \"current_out\" FROM \"logstash_events\" WHERE (\"host\" =~ /^$servername$/) AND $timeFilter GROUP BY time($__interval), \"host\" fill(null)", - "rawQuery": true - }, - { - "refId": "B", - "hide": false, - "policy": "so_long_term", - "resultFormat": "time_series", - "orderByTime": "ASC", - "tags": [ - { - "key": "host", - "value": "/^$servername$/", - "operator": "=~" - } - ], - "groupBy": [ - { - "type": "time", - "params": [ - "$__interval" - ] - }, - { - "type": "tag", - "params": [ - "host" - ] - }, - { - "type": "fill", - "params": [ - "null" - ] - } - ], - "select": [ - [ - { - "type": "field", - "params": [ - "mean_in" - ] - }, - { - "type": "mean", - "params": [] - }, - { - "type": "non_negative_derivative", - "params": [ - "1s" - ] - } - ] - ], - "measurement": "logstash_events", - "alias": "$tag_host: $col", - "query": "SELECT non_negative_derivative(mean(\"mean_out\"), 1s) as \"trend_out\" FROM \"so_long_term\".\"logstash_events\" WHERE (\"host\" =~ /^$servername$/) AND $timeFilter GROUP BY time($__interval), \"host\" fill(null)", - "rawQuery": true - } - ], - "maxDataPoints": null, - "description": "", - "timeFrom": null, - "timeShift": null -} diff --git a/salt/grafana/panels/logstash_estimated_eps_out_stat.json.jinja b/salt/grafana/panels/logstash_estimated_eps_out_stat.json.jinja deleted file mode 100644 index dc87661f5..000000000 --- a/salt/grafana/panels/logstash_estimated_eps_out_stat.json.jinja +++ /dev/null @@ -1,136 +0,0 @@ -{ - "id": 22323, - "gridPos": { - "x": {{ PANELS.logstash_estimated_eps_out_stat.gridPos.x }}, - "y": {{ PANELS.logstash_estimated_eps_out_stat.gridPos.y }}, - "w": {{ PANELS.logstash_estimated_eps_out_stat.gridPos.w }}, - "h": {{ PANELS.logstash_estimated_eps_out_stat.gridPos.h }} - }, - "type": "stat", - "title": "Estimated EPS Out - Selected Total", - "datasource": "InfluxDB", - "pluginVersion": "8.2.1", - "interval": "30s", - "links": [], - "fieldConfig": { - "defaults": { - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "dark-red", - "value": null - }, - { - "color": "dark-green", - "value": 1 - } - ] - }, - "mappings": [ - { - "type": "special", - "options": { - "match": "null", - "result": { - "text": "N/A" - } - } - } - ], - "color": { - "mode": "thresholds" - }, - "decimals": 0, - "unit": "short" - }, - "overrides": [] - }, - "options": { - "reduceOptions": { - "values": false, - "calcs": [ - "lastNotNull" - ], - "fields": "" - }, - "orientation": "horizontal", - "text": {}, - "textMode": "value", - "colorMode": "value", - "graphMode": "area", - "justifyMode": "auto" - }, - "targets": [ - { - "refId": "A", - "hide": false, - "policy": "default", - "resultFormat": "time_series", - "orderByTime": "ASC", - "tags": [ - { - "key": "host", - "value": "/^$servername$/", - "operator": "=~" - } - ], - "groupBy": [ - { - "type": "time", - "params": [ - "$__interval" - ] - }, - { - "type": "tag", - "params": [ - "host" - ] - }, - { - "type": "fill", - "params": [ - "null" - ] - } - ], - "select": [ - [ - { - "type": "field", - "params": [ - "out" - ] - }, - { - "type": "mean", - "params": [] - }, - { - "type": "non_negative_derivative", - "params": [ - "1s" - ] - } - ] - ], - "measurement": "logstash_events" - } - ], - "transformations": [ - { - "id": "calculateField", - "options": { - "mode": "reduceRow", - "reduce": { - "reducer": "sum" - }, - "replaceFields": true - } - } - ], - "maxDataPoints": null, - "cacheTimeout": null, - "timeFrom": null -} diff --git a/salt/grafana/panels/logstash_estimated_eps_out_total_graph.json.jinja b/salt/grafana/panels/logstash_estimated_eps_out_total_graph.json.jinja deleted file mode 100644 index 3d1600c39..000000000 --- a/salt/grafana/panels/logstash_estimated_eps_out_total_graph.json.jinja +++ /dev/null @@ -1,156 +0,0 @@ -{ - "id": 69002, - "gridPos": { - "x": {{ PANELS.logstash_estimated_eps_out_total_graph.gridPos.x }}, - "y": {{ PANELS.logstash_estimated_eps_out_total_graph.gridPos.y }}, - "w": {{ PANELS.logstash_estimated_eps_out_total_graph.gridPos.w }}, - "h": {{ PANELS.logstash_estimated_eps_out_total_graph.gridPos.h }} - }, - "type": "timeseries", - "title": "Estimated EPS Out - Selected Total", - "transformations": [ - { - "id": "calculateField", - "options": { - "mode": "reduceRow", - "reduce": { - "reducer": "sum" - }, - "replaceFields": true, - "alias": "Total EPS" - } - } - ], - "datasource": "InfluxDB", - "pluginVersion": "8.2.1", - "interval": "30s", - "fieldConfig": { - "defaults": { - "custom": { - "drawStyle": "line", - "lineInterpolation": "linear", - "barAlignment": 0, - "lineWidth": 1, - "fillOpacity": 10, - "gradientMode": "none", - "spanNulls": false, - "showPoints": "never", - "pointSize": 5, - "stacking": { - "mode": "none", - "group": "A" - }, - "axisPlacement": "auto", - "axisLabel": "EPS", - "scaleDistribution": { - "type": "linear" - }, - "hideFrom": { - "tooltip": false, - "viz": false, - "legend": false - }, - "thresholdsStyle": { - "mode": "off" - } - }, - "color": { - "mode": "palette-classic" - }, - "thresholds": { - "mode": "absolute", - "steps": [ - { - "value": null, - "color": "green" - }, - { - "value": 80, - "color": "red" - } - ] - }, - "mappings": [], - "unit": "short", - "decimals": 1 - }, - "overrides": [] - }, - "options": { - "tooltip": { - "mode": "single" - }, - "legend": { - "displayMode": "table", - "placement": "right", - "calcs": [ - "max", - "mean", - "lastNotNull" - ] - } - }, - "targets": [ - { - "refId": "A", - "hide": false, - "policy": "default", - "resultFormat": "time_series", - "orderByTime": "ASC", - "tags": [ - { - "key": "host", - "value": "/^$servername$/", - "operator": "=~" - } - ], - "groupBy": [ - { - "type": "time", - "params": [ - "$__interval" - ] - }, - { - "type": "tag", - "params": [ - "host" - ] - }, - { - "type": "fill", - "params": [ - "null" - ] - } - ], - "select": [ - [ - { - "type": "field", - "params": [ - "out" - ] - }, - { - "type": "mean", - "params": [] - }, - { - "type": "non_negative_derivative", - "params": [ - "1s" - ] - } - ] - ], - "measurement": "logstash_events", - "query": "SELECT non_negative_derivative(mean(\"in\"), 1s) FROM \"logstash_events\" WHERE (\"host\" =~ /^$servername$/) AND $timeFilter GROUP BY time($__interval), \"host\" fill(null)", - "rawQuery": false - } - ], - "maxDataPoints": null, - "description": "", - "timeFrom": null, - "timeShift": null -} diff --git a/salt/grafana/panels/logstash_indexing_eps_in_out_searchnode_graph.json.jinja b/salt/grafana/panels/logstash_indexing_eps_in_out_searchnode_graph.json.jinja deleted file mode 100644 index ab7a569bb..000000000 --- a/salt/grafana/panels/logstash_indexing_eps_in_out_searchnode_graph.json.jinja +++ /dev/null @@ -1,411 +0,0 @@ -{ - "id": 445554, - "gridPos": { - "x": {{ PANELS.logstash_indexing_eps_in_out_searchnode_graph.gridPos.x }}, - "y": {{ PANELS.logstash_indexing_eps_in_out_searchnode_graph.gridPos.y }}, - "w": {{ PANELS.logstash_indexing_eps_in_out_searchnode_graph.gridPos.w }}, - "h": {{ PANELS.logstash_indexing_eps_in_out_searchnode_graph.gridPos.h }} - }, - "type": "timeseries", - "title": "Indexing Events Per Second - $searchnode", - "repeat": "searchnode", - "repeatDirection": "v", - "transformations": [], - "datasource": "InfluxDB", - "pluginVersion": "8.2.1", - "interval": "30s", - "fieldConfig": { - "defaults": { - "custom": { - "drawStyle": "line", - "lineInterpolation": "linear", - "barAlignment": 0, - "lineWidth": 1, - "fillOpacity": 50, - "gradientMode": "none", - "spanNulls": false, - "showPoints": "never", - "pointSize": 5, - "stacking": { - "mode": "none", - "group": "A" - }, - "axisPlacement": "auto", - "axisLabel": "EPS", - "scaleDistribution": { - "type": "linear" - }, - "hideFrom": { - "tooltip": false, - "viz": false, - "legend": false - }, - "thresholdsStyle": { - "mode": "off" - } - }, - "color": { - "mode": "palette-classic" - }, - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green", - "value": null - } - ] - }, - "mappings": [], - "decimals": 2, - "unit": "short" - }, - "overrides": [ - { - "matcher": { - "id": "byRegexp", - "options": "/Incoming/" - }, - "properties": [ - { - "id": "color", - "value": { - "fixedColor": "orange", - "mode": "fixed" - } - } - ] - }, - { - "matcher": { - "id": "byRegexp", - "options": "/Outgoing/" - }, - "properties": [ - { - "id": "color", - "value": { - "fixedColor": "green", - "mode": "fixed" - } - } - ] - }, - { - "matcher": { - "id": "byName", - "options": "Incoming hidden" - }, - "properties": [ - { - "id": "custom.fillBelowTo", - "value": "Outgoing hidden" - } - ] - }, - { - "matcher": { - "id": "byName", - "options": "Incoming" - }, - "properties": [ - { - "id": "custom.fillOpacity", - "value": 0 - } - ] - }, - { - "matcher": { - "id": "byName", - "options": "Outgoing" - }, - "properties": [ - { - "id": "custom.fillOpacity", - "value": 0 - } - ] - }, - { - "matcher": { - "id": "byName", - "options": "Outgoing hidden" - }, - "properties": [ - { - "id": "custom.fillBelowTo", - "value": "Incoming hidden" - } - ] - }, - { - "matcher": { - "id": "byRegexp", - "options": "/hidden/" - }, - "properties": [ - { - "id": "custom.hideFrom", - "value": { - "legend": true, - "tooltip": true, - "viz": false - } - } - ] - } - ] - }, - "options": { - "tooltip": { - "mode": "multi" - }, - "legend": { - "displayMode": "table", - "placement": "bottom", - "calcs": [ - "max", - "mean" - ] - } - }, - "targets": [ - { - "alias": "Incoming", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "host" - ], - "type": "tag" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "hide": false, - "measurement": "logstash_events", - "orderByTime": "ASC", - "policy": "default", - "query": "SELECT non_negative_derivative(mean(\"in\"), 1s) FROM \"logstash_events\" WHERE (\"role\" = \"searchnode\") AND $timeFilter GROUP BY time($__interval), \"host\" fill(null)", - "rawQuery": false, - "refId": "A", - "resultFormat": "time_series", - "select": [ - [ - { - "type": "field", - "params": [ - "in" - ] - }, - { - "type": "mean", - "params": [] - }, - { - "type": "non_negative_derivative", - "params": [ - "1s" - ] - } - ] - ], - "tags": [ - { - "key": "host", - "operator": "=", - "value": "$searchnode" - } - ] - }, - { - "alias": "Outgoing", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "host" - ], - "type": "tag" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "hide": false, - "measurement": "logstash_events", - "orderByTime": "ASC", - "policy": "default", - "query": "SELECT non_negative_derivative(mean(\"in\"), 1s) FROM \"logstash_events\" WHERE (\"role\" = \"searchnode\") AND $timeFilter GROUP BY time($__interval), \"host\" fill(null)", - "rawQuery": false, - "refId": "B", - "resultFormat": "time_series", - "select": [ - [ - { - "type": "field", - "params": [ - "out" - ] - }, - { - "type": "mean", - "params": [] - }, - { - "type": "non_negative_derivative", - "params": [ - "1s" - ] - } - ] - ], - "tags": [ - { - "key": "host", - "operator": "=", - "value": "$searchnode" - } - ] - }, - { - "alias": "Incoming hidden", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "host" - ], - "type": "tag" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "hide": false, - "measurement": "logstash_events", - "orderByTime": "ASC", - "policy": "default", - "query": "SELECT non_negative_derivative(mean(\"in\"), 1s) FROM \"logstash_events\" WHERE (\"role\" = \"searchnode\") AND $timeFilter GROUP BY time($__interval), \"host\" fill(null)", - "rawQuery": false, - "refId": "C", - "resultFormat": "time_series", - "select": [ - [ - { - "type": "field", - "params": [ - "in" - ] - }, - { - "type": "mean", - "params": [] - }, - { - "type": "non_negative_derivative", - "params": [ - "1s" - ] - } - ] - ], - "tags": [ - { - "key": "host", - "operator": "=", - "value": "$searchnode" - } - ] - }, - { - "alias": "Outgoing hidden", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "host" - ], - "type": "tag" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "hide": false, - "measurement": "logstash_events", - "orderByTime": "ASC", - "policy": "default", - "query": "SELECT non_negative_derivative(mean(\"in\"), 1s) FROM \"logstash_events\" WHERE (\"role\" = \"searchnode\") AND $timeFilter GROUP BY time($__interval), \"host\" fill(null)", - "rawQuery": false, - "refId": "D", - "resultFormat": "time_series", - "select": [ - [ - { - "type": "field", - "params": [ - "out" - ] - }, - { - "type": "mean", - "params": [] - }, - { - "type": "non_negative_derivative", - "params": [ - "1s" - ] - } - ] - ], - "tags": [ - { - "key": "host", - "operator": "=", - "value": "$searchnode" - } - ] - } - ], - "description": "", - "maxDataPoints": null, - "timeFrom": null, - "timeShift": null -} diff --git a/salt/grafana/panels/logstash_indexing_eps_in_searchnode_total_graph.json.jinja b/salt/grafana/panels/logstash_indexing_eps_in_searchnode_total_graph.json.jinja deleted file mode 100644 index 81876a606..000000000 --- a/salt/grafana/panels/logstash_indexing_eps_in_searchnode_total_graph.json.jinja +++ /dev/null @@ -1,170 +0,0 @@ -{ - "id": 69001, - "gridPos": { - "x": {{ PANELS.logstash_indexing_eps_in_searchnode_total_graph.gridPos.x }}, - "y": {{ PANELS.logstash_indexing_eps_in_searchnode_total_graph.gridPos.y }}, - "w": {{ PANELS.logstash_indexing_eps_in_searchnode_total_graph.gridPos.w }}, - "h": {{ PANELS.logstash_indexing_eps_in_searchnode_total_graph.gridPos.h }} - }, - "type": "timeseries", - "title": "Total Searchnode Indexing Events Per Second", - "transformations": [ - { - "id": "calculateField", - "options": { - "alias": "Total EPS", - "mode": "reduceRow", - "reduce": { - "reducer": "sum" - }, - "replaceFields": true - } - } - ], - "datasource": "InfluxDB", - "pluginVersion": "8.2.1", - "interval": "30s", - "fieldConfig": { - "defaults": { - "custom": { - "drawStyle": "line", - "lineInterpolation": "linear", - "barAlignment": 0, - "lineWidth": 1, - "fillOpacity": 10, - "gradientMode": "none", - "spanNulls": false, - "showPoints": "never", - "pointSize": 5, - "stacking": { - "mode": "none", - "group": "A" - }, - "axisPlacement": "auto", - "axisLabel": "EPS", - "scaleDistribution": { - "type": "linear" - }, - "hideFrom": { - "tooltip": false, - "viz": false, - "legend": false - }, - "thresholdsStyle": { - "mode": "off" - } - }, - "color": { - "mode": "fixed", - "fixedColor": "orange" - }, - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green", - "value": null - } - ] - }, - "mappings": [], - "decimals": 2, - "unit": "short" - }, - "overrides": [] - }, - "options": { - "tooltip": { - "mode": "single" - }, - "legend": { - "displayMode": "table", - "placement": "bottom", - "calcs": [ - "max", - "mean" - ] - } - }, - "targets": [ - { - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "host" - ], - "type": "tag" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "hide": false, - "measurement": "logstash_events", - "orderByTime": "ASC", - "policy": "default", - "query": "SELECT non_negative_derivative(mean(\"in\"), 1s) FROM \"logstash_events\" WHERE (\"role\" = \"searchnode\") AND $timeFilter GROUP BY time($__interval), \"host\" fill(null)", - "rawQuery": false, - "refId": "A", - "resultFormat": "time_series", - "select": [ - [ - { - "type": "field", - "params": [ - "in" - ] - }, - { - "type": "mean", - "params": [] - }, - { - "type": "non_negative_derivative", - "params": [ - "1s" - ] - } - ] - ], - "tags": [ - { - "key": "role", - "operator": "=~", - "value": "/search/" - }, - { - "key": "role", - "value": "heavynode", - "operator": "=", - "condition": "OR" - }, - { - "key": "role", - "value": "standalone", - "operator": "=", - "condition": "OR" - }, - { - "key": "role", - "value": "eval", - "operator": "=", - "condition": "OR" - } - ] - } - ], - "description": "", - "maxDataPoints": null, - "timeFrom": null, - "timeShift": null -} diff --git a/salt/grafana/panels/management_interface_drops_graph.json.jinja b/salt/grafana/panels/management_interface_drops_graph.json.jinja deleted file mode 100644 index 9de6c8f19..000000000 --- a/salt/grafana/panels/management_interface_drops_graph.json.jinja +++ /dev/null @@ -1,282 +0,0 @@ -{ - "id": 61877, - "gridPos": { - "x": {{ PANELS.management_interface_drops_graph.gridPos.x }}, - "y": {{ PANELS.management_interface_drops_graph.gridPos.y }}, - "w": {{ PANELS.management_interface_drops_graph.gridPos.w }}, - "h": {{ PANELS.management_interface_drops_graph.gridPos.h }} - }, - "type": "timeseries", - "title": "Management Interface Drops", - "datasource": "InfluxDB", - "pluginVersion": "8.2.1", - "maxDataPoints": 750, - "interval": "30s", - "options": { - "tooltip": { - "mode": "single" - }, - "legend": { - "displayMode": "table", - "placement": "bottom", - "calcs": [ - "max", - "mean", - "lastNotNull" - ] - } - }, - "targets": [ - { - "alias": "$tag_host: $tag_interface: $col", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "orderByTime": "ASC", - "policy": "default", - "query": "SELECT non_negative_derivative(mean(drop_in), 1s) as \"in\" FROM \"net\" WHERE host =~ /$servername/ AND interface =~ /$manint/ AND $timeFilter GROUP BY time($__interval), host,interface fill(none)", - "queryType": "randomWalk", - "rawQuery": true, - "refId": "A", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "value" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], - "tags": [] - }, - { - "alias": "$tag_host: $tag_interface: $col", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "hide": false, - "orderByTime": "ASC", - "policy": "default", - "query": "SELECT non_negative_derivative(mean(drop_out), 1s) as \"out\" FROM \"net\" WHERE host =~ /$servername/ AND interface =~ /$manint/ AND $timeFilter GROUP BY time($__interval), host,interface fill(none)", - "rawQuery": true, - "refId": "B", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "value" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], - "tags": [] - }, - { - "alias": "$tag_host: $tag_interface: $col", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "hide": false, - "orderByTime": "ASC", - "policy": "default", - "query": "SELECT non_negative_derivative(mean(mean_drop_in), 1s) as \"trend_in\" FROM \"so_long_term\".\"net\" WHERE host =~ /$servername/ AND interface =~ /$manint/ AND $timeFilter GROUP BY time($__interval), host,interface fill(none)", - "queryType": "randomWalk", - "rawQuery": true, - "refId": "C", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "value" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], - "tags": [] - }, - { - "alias": "$tag_host: $tag_interface: $col", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "hide": false, - "orderByTime": "ASC", - "policy": "default", - "query": "SELECT non_negative_derivative(mean(mean_drop_out), 1s) as \"trend_out\" FROM \"so_long_term\".\"net\" WHERE host =~ /$servername/ AND interface =~ /$manint/ AND $timeFilter GROUP BY time($__interval), host,interface fill(none)", - "rawQuery": true, - "refId": "D", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "value" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], - "tags": [] - } - ], - "fieldConfig": { - "defaults": { - "custom": { - "drawStyle": "line", - "lineInterpolation": "linear", - "barAlignment": 0, - "lineWidth": 1, - "fillOpacity": 10, - "gradientMode": "none", - "spanNulls": false, - "showPoints": "never", - "pointSize": 5, - "stacking": { - "mode": "none", - "group": "A" - }, - "axisPlacement": "auto", - "axisLabel": "Drops per second", - "scaleDistribution": { - "type": "linear" - }, - "hideFrom": { - "tooltip": false, - "viz": false, - "legend": false - }, - "thresholdsStyle": { - "mode": "off" - } - }, - "color": { - "mode": "palette-classic" - }, - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green", - "value": null - } - ] - }, - "mappings": [], - "unit": "pps", - "min": 0, - "decimals": 1 - }, - "overrides": [ - { - "matcher": { - "id": "byRegexp", - "options": "/trend/" - }, - "properties": [ - { - "id": "custom.fillOpacity", - "value": 0 - }, - { - "id": "custom.lineWidth", - "value": 4 - }, - { - "id": "custom.lineStyle", - "value": { - "fill": "dash", - "dash": [ - 4, - 10 - ] - } - } - ] - }, - { - "matcher": { - "id": "byRegexp", - "options": "/veth/" - }, - "properties": [ - { - "id": "custom.hideFrom", - "value": { - "tooltip": true, - "viz": true, - "legend": true - } - } - ] - } - ] - }, - "timeFrom": null, - "timeShift": null -} diff --git a/salt/grafana/panels/management_interface_drops_inbound_graph.json.jinja b/salt/grafana/panels/management_interface_drops_inbound_graph.json.jinja deleted file mode 100644 index 1ca096743..000000000 --- a/salt/grafana/panels/management_interface_drops_inbound_graph.json.jinja +++ /dev/null @@ -1,142 +0,0 @@ -{ - "id": 61877, - "gridPos": { - "x": {{ PANELS.management_interface_drops_inbound_graph.gridPos.x }}, - "y": {{ PANELS.management_interface_drops_inbound_graph.gridPos.y }}, - "w": {{ PANELS.management_interface_drops_inbound_graph.gridPos.w }}, - "h": {{ PANELS.management_interface_drops_inbound_graph.gridPos.h }} - }, - "type": "timeseries", - "title": "Management Interface Drops - Inbound", - "datasource": "InfluxDB", - "pluginVersion": "8.2.1", - "interval": "30s", - "fieldConfig": { - "defaults": { - "custom": { - "drawStyle": "line", - "lineInterpolation": "linear", - "barAlignment": 0, - "lineWidth": 1, - "fillOpacity": 0, - "gradientMode": "none", - "spanNulls": false, - "showPoints": "never", - "pointSize": 5, - "stacking": { - "mode": "none", - "group": "A" - }, - "axisPlacement": "auto", - "axisLabel": "Drops per second", - "scaleDistribution": { - "type": "linear" - }, - "hideFrom": { - "tooltip": false, - "viz": false, - "legend": false - }, - "thresholdsStyle": { - "mode": "off" - } - }, - "color": { - "mode": "palette-classic" - }, - "thresholds": { - "mode": "absolute", - "steps": [ - { - "value": null, - "color": "green" - }, - { - "value": 80, - "color": "red" - } - ] - }, - "mappings": [], - "unit": "pps", - "min": 0, - "decimals": 1 - }, - "overrides": [ - { - "matcher": { - "id": "byRegexp", - "options": "/veth/" - }, - "properties": [ - { - "id": "custom.hideFrom", - "value": { - "tooltip": true, - "viz": true, - "legend": true - } - } - ] - } - ] - }, - "options": { - "tooltip": { - "mode": "single" - }, - "legend": { - "displayMode": "table", - "placement": "right", - "calcs": [ - "max", - "mean", - "lastNotNull" - ] - } - }, - "targets": [ - { - "alias": "$tag_host: $tag_role", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "orderByTime": "ASC", - "policy": "default", - "query": "SELECT non_negative_derivative(mean(drop_in), 1s) as \"in\" FROM \"net\" WHERE host =~ /$servername/ AND interface =~ /$manint/ AND $timeFilter GROUP BY time($__interval), host,role fill(none)", - "queryType": "randomWalk", - "rawQuery": true, - "refId": "A", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "value" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], - "tags": [] - } - ], - "maxDataPoints": null, - "timeFrom": null, - "timeShift": null -} diff --git a/salt/grafana/panels/management_interface_drops_outbound_graph.json.jinja b/salt/grafana/panels/management_interface_drops_outbound_graph.json.jinja deleted file mode 100644 index 91fcb5b22..000000000 --- a/salt/grafana/panels/management_interface_drops_outbound_graph.json.jinja +++ /dev/null @@ -1,142 +0,0 @@ -{ - "id": 188189, - "gridPos": { - "x": {{ PANELS.management_interface_drops_outbound_graph.gridPos.x }}, - "y": {{ PANELS.management_interface_drops_outbound_graph.gridPos.y }}, - "w": {{ PANELS.management_interface_drops_outbound_graph.gridPos.w }}, - "h": {{ PANELS.management_interface_drops_outbound_graph.gridPos.h }} - }, - "type": "timeseries", - "title": "Management Interface Drops - Outbound", - "datasource": "InfluxDB", - "pluginVersion": "8.2.1", - "interval": "30s", - "fieldConfig": { - "defaults": { - "custom": { - "drawStyle": "line", - "lineInterpolation": "linear", - "barAlignment": 0, - "lineWidth": 1, - "fillOpacity": 0, - "gradientMode": "none", - "spanNulls": false, - "showPoints": "never", - "pointSize": 5, - "stacking": { - "mode": "none", - "group": "A" - }, - "axisPlacement": "auto", - "axisLabel": "Drops per second", - "scaleDistribution": { - "type": "linear" - }, - "hideFrom": { - "tooltip": false, - "viz": false, - "legend": false - }, - "thresholdsStyle": { - "mode": "off" - } - }, - "color": { - "mode": "palette-classic" - }, - "thresholds": { - "mode": "absolute", - "steps": [ - { - "value": null, - "color": "green" - }, - { - "value": 80, - "color": "red" - } - ] - }, - "mappings": [], - "unit": "pps", - "min": 0, - "decimals": 1 - }, - "overrides": [ - { - "matcher": { - "id": "byRegexp", - "options": "/veth/" - }, - "properties": [ - { - "id": "custom.hideFrom", - "value": { - "tooltip": true, - "viz": true, - "legend": true - } - } - ] - } - ] - }, - "options": { - "tooltip": { - "mode": "single" - }, - "legend": { - "displayMode": "table", - "placement": "right", - "calcs": [ - "max", - "mean", - "lastNotNull" - ] - } - }, - "targets": [ - { - "alias": "$tag_host: $tag_role", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "hide": false, - "orderByTime": "ASC", - "policy": "default", - "query": "SELECT non_negative_derivative(mean(drop_out), 1s) as \"out\" FROM \"net\" WHERE host =~ /$servername/ AND interface =~ /$manint/ AND $timeFilter GROUP BY time($__interval), host,role fill(none)", - "rawQuery": true, - "refId": "B", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "value" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], - "tags": [] - } - ], - "maxDataPoints": null, - "timeFrom": null, - "timeShift": null -} diff --git a/salt/grafana/panels/management_interface_packets_graph.json.jinja b/salt/grafana/panels/management_interface_packets_graph.json.jinja deleted file mode 100644 index b3e429f2f..000000000 --- a/salt/grafana/panels/management_interface_packets_graph.json.jinja +++ /dev/null @@ -1,283 +0,0 @@ -{ - "id": 61875, - "gridPos": { - "x": {{ PANELS.management_interface_packets_graph.gridPos.x }}, - "y": {{ PANELS.management_interface_packets_graph.gridPos.y }}, - "w": {{ PANELS.management_interface_packets_graph.gridPos.w }}, - "h": {{ PANELS.management_interface_packets_graph.gridPos.h }} - }, - "type": "timeseries", - "title": "Management Interface Packets", - "datasource": "InfluxDB", - "pluginVersion": "8.2.1", - "interval": "30s", - "options": { - "tooltip": { - "mode": "single" - }, - "legend": { - "displayMode": "table", - "placement": "bottom", - "calcs": [ - "max", - "mean", - "lastNotNull" - ] - } - }, - "targets": [ - { - "alias": "$tag_host: $tag_interface: $col", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "orderByTime": "ASC", - "policy": "default", - "query": "SELECT non_negative_derivative(mean(packets_recv), 1s) as \"in\" FROM \"net\" WHERE host =~ /$servername/ AND interface =~ /$manint/ AND $timeFilter GROUP BY time($__interval), * fill(none)", - "queryType": "randomWalk", - "rawQuery": true, - "refId": "A", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "value" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], - "tags": [], - "hide": false - }, - { - "alias": "$tag_host: $tag_interface: $col", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "hide": false, - "orderByTime": "ASC", - "policy": "default", - "query": "SELECT non_negative_derivative(mean(packets_sent), 1s) as \"out\" FROM \"net\" WHERE host =~ /$servername/ AND interface =~ /$manint/ AND $timeFilter GROUP BY time($__interval), * fill(none)", - "rawQuery": true, - "refId": "B", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "value" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], - "tags": [] - }, - { - "alias": "$tag_host: $tag_interface: $col", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "hide": false, - "orderByTime": "ASC", - "policy": "default", - "query": "SELECT non_negative_derivative(mean(mean_packets_recv), 1s) as \"trend_in\" FROM \"so_long_term\".\"net\" WHERE host =~ /$servername/ AND interface =~ /$manint/ AND $timeFilter GROUP BY time($__interval), * fill(none)", - "queryType": "randomWalk", - "rawQuery": true, - "refId": "C", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "value" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], - "tags": [] - }, - { - "alias": "$tag_host: $tag_interface: $col", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "hide": false, - "orderByTime": "ASC", - "policy": "default", - "query": "SELECT non_negative_derivative(mean(mean_packets_sent), 1s) as \"trend_out\" FROM \"so_long_term\".\"net\" WHERE host =~ /$servername/ AND interface =~ /$manint/ AND $timeFilter GROUP BY time($__interval), * fill(none)", - "rawQuery": true, - "refId": "D", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "value" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], - "tags": [] - } - ], - "fieldConfig": { - "defaults": { - "custom": { - "drawStyle": "line", - "lineInterpolation": "linear", - "barAlignment": 0, - "lineWidth": 1, - "fillOpacity": 10, - "gradientMode": "none", - "spanNulls": false, - "showPoints": "never", - "pointSize": 5, - "stacking": { - "mode": "none", - "group": "A" - }, - "axisPlacement": "auto", - "axisLabel": "Packets per second", - "scaleDistribution": { - "type": "linear" - }, - "hideFrom": { - "tooltip": false, - "viz": false, - "legend": false - }, - "thresholdsStyle": { - "mode": "off" - } - }, - "color": { - "mode": "palette-classic" - }, - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green", - "value": null - } - ] - }, - "mappings": [], - "unit": "pps", - "min": 0, - "decimals": 1 - }, - "overrides": [ - { - "matcher": { - "id": "byRegexp", - "options": "/trend/" - }, - "properties": [ - { - "id": "custom.fillOpacity", - "value": 0 - }, - { - "id": "custom.lineWidth", - "value": 4 - }, - { - "id": "custom.lineStyle", - "value": { - "fill": "dash", - "dash": [ - 4, - 10 - ] - } - } - ] - }, - { - "matcher": { - "id": "byRegexp", - "options": "/veth/" - }, - "properties": [ - { - "id": "custom.hideFrom", - "value": { - "tooltip": true, - "viz": true, - "legend": true - } - } - ] - } - ] - }, - "maxDataPoints": null, - "timeFrom": null, - "timeShift": null -} diff --git a/salt/grafana/panels/management_interface_traffic_both_graph.json.jinja b/salt/grafana/panels/management_interface_traffic_both_graph.json.jinja deleted file mode 100644 index e15bef885..000000000 --- a/salt/grafana/panels/management_interface_traffic_both_graph.json.jinja +++ /dev/null @@ -1,409 +0,0 @@ -{ - "id": 18, - "gridPos": { - "x": {{ PANELS.management_interface_traffic_both_graph.gridPos.x }}, - "y": {{ PANELS.management_interface_traffic_both_graph.gridPos.y }}, - "w": {{ PANELS.management_interface_traffic_both_graph.gridPos.w }}, - "h": {{ PANELS.management_interface_traffic_both_graph.gridPos.h }} - }, - "type": "timeseries", - "title": "Management Interface Traffic ", - "datasource": "InfluxDB", - "pluginVersion": "8.2.1", - "interval": "30s", - "links": [], - "fieldConfig": { - "defaults": { - "custom": { - "drawStyle": "line", - "lineInterpolation": "linear", - "barAlignment": 0, - "lineWidth": 2, - "fillOpacity": 10, - "gradientMode": "none", - "spanNulls": false, - "showPoints": "never", - "pointSize": 5, - "stacking": { - "mode": "none", - "group": "A" - }, - "axisPlacement": "auto", - "axisLabel": "", - "scaleDistribution": { - "type": "linear" - }, - "hideFrom": { - "tooltip": false, - "viz": false, - "legend": false - }, - "thresholdsStyle": { - "mode": "off" - } - }, - "color": { - "mode": "palette-classic" - }, - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green", - "value": null - } - ] - }, - "mappings": [], - "links": [], - "unit": "bps", - "decimals": 1 - }, - "overrides": [ - { - "matcher": { - "id": "byRegexp", - "options": "/Trend/" - }, - "properties": [ - { - "id": "custom.fillOpacity", - "value": 0 - }, - { - "id": "custom.lineWidth", - "value": 4 - }, - { - "id": "custom.lineStyle", - "value": { - "dash": [ - 4, - 10 - ], - "fill": "dash" - } - } - ] - } - ] - }, - "options": { - "tooltip": { - "mode": "single" - }, - "legend": { - "displayMode": "table", - "placement": "right", - "calcs": [ - "max", - "mean", - "lastNotNull" - ] - } - }, - "targets": [ - { - "alias": "$tag_host: $tag_interface: RX Current", - "dsType": "influxdb", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "host" - ], - "type": "tag" - }, - { - "params": [ - "interface" - ], - "type": "tag" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "measurement": "net", - "orderByTime": "ASC", - "policy": "default", - "refId": "A", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "bytes_recv" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - }, - { - "params": [ - "1s" - ], - "type": "non_negative_derivative" - }, - { - "params": [ - "*8" - ], - "type": "math" - } - ] - ], - "tags": [ - { - "key": "host", - "operator": "=~", - "value": "/^$servername$/" - }, - { - "condition": "AND", - "key": "interface", - "operator": "=~", - "value": "/^$manint$/" - } - ] - }, - { - "alias": "$tag_host: $tag_interface: TX Current", - "dsType": "influxdb", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "host" - ], - "type": "tag" - }, - { - "params": [ - "interface" - ], - "type": "tag" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "measurement": "net", - "orderByTime": "ASC", - "policy": "default", - "refId": "B", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "bytes_sent" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - }, - { - "params": [ - "1s" - ], - "type": "non_negative_derivative" - }, - { - "params": [ - "*8" - ], - "type": "math" - } - ] - ], - "tags": [ - { - "key": "host", - "operator": "=~", - "value": "/^$servername$/" - }, - { - "condition": "AND", - "key": "interface", - "operator": "=~", - "value": "/^$manint$/" - } - ] - }, - { - "alias": "$tag_host: $tag_interface: RX Trend", - "dsType": "influxdb", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "host" - ], - "type": "tag" - }, - { - "params": [ - "interface" - ], - "type": "tag" - }, - { - "params": [ - "linear" - ], - "type": "fill" - } - ], - "hide": false, - "measurement": "net", - "orderByTime": "ASC", - "policy": "so_long_term", - "refId": "C", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "mean_bytes_recv" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - }, - { - "params": [ - "1s" - ], - "type": "non_negative_derivative" - }, - { - "params": [ - "*8" - ], - "type": "math" - } - ] - ], - "tags": [ - { - "key": "host", - "operator": "=~", - "value": "/^$servername$/" - }, - { - "condition": "AND", - "key": "interface", - "operator": "=~", - "value": "/^$manint$/" - } - ] - }, - { - "alias": "$tag_host: $tag_interface: TX Trend", - "dsType": "influxdb", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "host" - ], - "type": "tag" - }, - { - "params": [ - "interface" - ], - "type": "tag" - }, - { - "params": [ - "linear" - ], - "type": "fill" - } - ], - "hide": false, - "measurement": "net", - "orderByTime": "ASC", - "policy": "so_long_term", - "refId": "D", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "mean_bytes_sent" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - }, - { - "params": [ - "1s" - ], - "type": "non_negative_derivative" - }, - { - "params": [ - "*8" - ], - "type": "math" - } - ] - ], - "tags": [ - { - "key": "host", - "operator": "=~", - "value": "/^$servername$/" - }, - { - "condition": "AND", - "key": "interface", - "operator": "=~", - "value": "/^$manint$/" - } - ] - } - ], - "description": "", - "maxDataPoints": null, - "timeFrom": null, - "timeShift": null -} diff --git a/salt/grafana/panels/management_interface_traffic_inbound_graph.json.jinja b/salt/grafana/panels/management_interface_traffic_inbound_graph.json.jinja deleted file mode 100644 index 3f876a18d..000000000 --- a/salt/grafana/panels/management_interface_traffic_inbound_graph.json.jinja +++ /dev/null @@ -1,164 +0,0 @@ -{ - "id": 18, - "gridPos": { - "x": {{ PANELS.management_interface_traffic_inbound_graph.gridPos.x }}, - "y": {{ PANELS.management_interface_traffic_inbound_graph.gridPos.y }}, - "w": {{ PANELS.management_interface_traffic_inbound_graph.gridPos.w }}, - "h": {{ PANELS.management_interface_traffic_inbound_graph.gridPos.h }} - }, - "type": "timeseries", - "title": "Management Interface Traffic - Inbound", - "datasource": "InfluxDB", - "pluginVersion": "8.2.1", - "interval": "30s", - "links": [], - "fieldConfig": { - "defaults": { - "custom": { - "drawStyle": "line", - "lineInterpolation": "linear", - "barAlignment": 0, - "lineWidth": 2, - "fillOpacity": 0, - "gradientMode": "none", - "spanNulls": false, - "showPoints": "never", - "pointSize": 5, - "stacking": { - "mode": "none", - "group": "A" - }, - "axisPlacement": "auto", - "axisLabel": "", - "scaleDistribution": { - "type": "linear" - }, - "hideFrom": { - "tooltip": false, - "viz": false, - "legend": false - }, - "thresholdsStyle": { - "mode": "off" - } - }, - "color": { - "mode": "palette-classic" - }, - "thresholds": { - "mode": "absolute", - "steps": [ - { - "value": null, - "color": "green" - }, - { - "value": 80, - "color": "red" - } - ] - }, - "mappings": [], - "links": [], - "unit": "bps", - "decimals": 1, - "min": 0 - }, - "overrides": [] - }, - "options": { - "tooltip": { - "mode": "single" - }, - "legend": { - "displayMode": "table", - "placement": "right", - "calcs": [ - "max", - "mean", - "lastNotNull" - ] - } - }, - "targets": [ - { - "alias": "$tag_host $tag_role", - "dsType": "influxdb", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "host" - ], - "type": "tag" - }, - { - "params": [ - "role" - ], - "type": "tag" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "measurement": "net", - "orderByTime": "ASC", - "policy": "default", - "query": "SELECT non_negative_derivative(mean(\"bytes_recv\"), 1s) *8 FROM \"net\" WHERE (\"host\" = '$servername' AND \"interface\" = '$manint') AND $timeFilter GROUP BY time($__interval) fill(null)", - "rawQuery": false, - "refId": "A", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "bytes_recv" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - }, - { - "params": [ - "1s" - ], - "type": "non_negative_derivative" - }, - { - "params": [ - "*8" - ], - "type": "math" - } - ] - ], - "tags": [ - { - "key": "host", - "operator": "=~", - "value": "/^$servername$/" - }, - { - "condition": "AND", - "key": "interface", - "operator": "=~", - "value": "/^$manint$/" - } - ] - } - ], - "maxDataPoints": null, - "timeFrom": null, - "timeShift": null -} diff --git a/salt/grafana/panels/management_interface_traffic_outbound_graph.json.jinja b/salt/grafana/panels/management_interface_traffic_outbound_graph.json.jinja deleted file mode 100644 index 48817d448..000000000 --- a/salt/grafana/panels/management_interface_traffic_outbound_graph.json.jinja +++ /dev/null @@ -1,162 +0,0 @@ -{ - "id": 69014, - "gridPos": { - "x": {{ PANELS.management_interface_traffic_outbound_graph.gridPos.x }}, - "y": {{ PANELS.management_interface_traffic_outbound_graph.gridPos.y }}, - "w": {{ PANELS.management_interface_traffic_outbound_graph.gridPos.w }}, - "h": {{ PANELS.management_interface_traffic_outbound_graph.gridPos.h }} - }, - "type": "timeseries", - "title": "Management Interface Traffic - Outbound", - "datasource": "InfluxDB", - "pluginVersion": "8.2.1", - "interval": "30s", - "links": [], - "fieldConfig": { - "defaults": { - "custom": { - "drawStyle": "line", - "lineInterpolation": "linear", - "barAlignment": 0, - "lineWidth": 2, - "fillOpacity": 0, - "gradientMode": "none", - "spanNulls": false, - "showPoints": "never", - "pointSize": 5, - "stacking": { - "mode": "none", - "group": "A" - }, - "axisPlacement": "auto", - "axisLabel": "", - "scaleDistribution": { - "type": "linear" - }, - "hideFrom": { - "tooltip": false, - "viz": false, - "legend": false - }, - "thresholdsStyle": { - "mode": "off" - } - }, - "color": { - "mode": "palette-classic" - }, - "thresholds": { - "mode": "absolute", - "steps": [ - { - "value": null, - "color": "green" - }, - { - "value": 80, - "color": "red" - } - ] - }, - "mappings": [], - "links": [], - "unit": "bps", - "decimals": 1, - "min": 0 - }, - "overrides": [] - }, - "options": { - "tooltip": { - "mode": "single" - }, - "legend": { - "displayMode": "table", - "placement": "right", - "calcs": [ - "max", - "mean", - "lastNotNull" - ] - } - }, - "targets": [ - { - "alias": "$tag_host $tag_role", - "dsType": "influxdb", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "host" - ], - "type": "tag" - }, - { - "params": [ - "role" - ], - "type": "tag" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "measurement": "net", - "orderByTime": "ASC", - "policy": "default", - "refId": "B", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "bytes_sent" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - }, - { - "params": [ - "1s" - ], - "type": "non_negative_derivative" - }, - { - "params": [ - "*8" - ], - "type": "math" - } - ] - ], - "tags": [ - { - "key": "host", - "operator": "=~", - "value": "/^$servername$/" - }, - { - "condition": "AND", - "key": "interface", - "operator": "=~", - "value": "/^$manint$/" - } - ] - } - ], - "maxDataPoints": null, - "timeFrom": null, - "timeShift": null -} diff --git a/salt/grafana/panels/memory_usage_graph.json.jinja b/salt/grafana/panels/memory_usage_graph.json.jinja deleted file mode 100644 index 662eb18c1..000000000 --- a/salt/grafana/panels/memory_usage_graph.json.jinja +++ /dev/null @@ -1,208 +0,0 @@ -{ - "id": 61873, - "gridPos": { - "x": {{ PANELS.memory_usage_graph.gridPos.x }}, - "y": {{ PANELS.memory_usage_graph.gridPos.y }}, - "w": {{ PANELS.memory_usage_graph.gridPos.w }}, - "h": {{ PANELS.memory_usage_graph.gridPos.h }} - }, - "type": "timeseries", - "title": "Memory Usage", - "datasource": "InfluxDB", - "pluginVersion": "8.2.1", - "interval": "30s", - "options": { - "tooltip": { - "mode": "single" - }, - "legend": { - "displayMode": "table", - "placement": "right", - "calcs": [ - "max", - "mean", - "lastNotNull" - ] - } - }, - "targets": [ - { - "alias": "$tag_host: $col", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "orderByTime": "ASC", - "policy": "default", - "query": "SELECT mean(total) as total, mean(used) as used, mean(cached) as cached, mean(free) as free, mean(buffered) as buffered FROM \"mem\" WHERE host =~ /$servername$/ AND $timeFilter GROUP BY time($__interval), host ORDER BY asc", - "queryType": "randomWalk", - "rawQuery": true, - "refId": "A", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "value" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], - "tags": [] - }, - { - "alias": "$tag_host: $col", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "hide": false, - "orderByTime": "ASC", - "policy": "default", - "query": "SELECT mean(mean_total) as trend_total, mean(mean_used) as trend_used, mean(mean_cached) as trend_cached, mean(mean_free) as trend_free, mean(mean_buffered) as trend_buffered FROM \"so_long_term\".\"mem\" WHERE host =~ /$servername$/ AND $timeFilter GROUP BY time($__interval), host fill(linear) ORDER BY asc", - "queryType": "randomWalk", - "rawQuery": true, - "refId": "B", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "value" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], - "tags": [] - } - ], - "fieldConfig": { - "defaults": { - "custom": { - "drawStyle": "line", - "lineInterpolation": "linear", - "barAlignment": 0, - "lineWidth": 1, - "fillOpacity": 10, - "gradientMode": "none", - "spanNulls": false, - "showPoints": "never", - "pointSize": 5, - "stacking": { - "mode": "none", - "group": "A" - }, - "axisPlacement": "auto", - "axisLabel": "", - "scaleDistribution": { - "type": "linear" - }, - "hideFrom": { - "tooltip": false, - "viz": false, - "legend": false - }, - "thresholdsStyle": { - "mode": "off" - } - }, - "color": { - "mode": "palette-classic" - }, - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green", - "value": null - } - ] - }, - "mappings": [], - "unit": "bytes", - "min": 0, - "decimals": 1 - }, - "overrides": [ - { - "matcher": { - "id": "byRegexp", - "options": "/total/" - }, - "properties": [ - { - "id": "color", - "value": { - "fixedColor": "#C4162A", - "mode": "fixed" - } - }, - { - "id": "custom.fillOpacity", - "value": 0 - } - ] - }, - { - "matcher": { - "id": "byRegexp", - "options": "/trend/" - }, - "properties": [ - { - "id": "custom.fillOpacity", - "value": 0 - }, - { - "id": "custom.lineWidth", - "value": 4 - }, - { - "id": "custom.lineStyle", - "value": { - "fill": "dash", - "dash": [ - 4, - 10 - ] - } - } - ] - } - ] - }, - "maxDataPoints": null, - "description": "", - "timeFrom": null, - "timeShift": null -} diff --git a/salt/grafana/panels/memory_usage_percent_graph.json.jinja b/salt/grafana/panels/memory_usage_percent_graph.json.jinja deleted file mode 100644 index 620c3ea72..000000000 --- a/salt/grafana/panels/memory_usage_percent_graph.json.jinja +++ /dev/null @@ -1,139 +0,0 @@ -{ - "id": 69013, - "gridPos": { - "x": {{ PANELS.memory_usage_percent_graph.gridPos.x }}, - "y": {{ PANELS.memory_usage_percent_graph.gridPos.y }}, - "w": {{ PANELS.memory_usage_percent_graph.gridPos.w }}, - "h": {{ PANELS.memory_usage_percent_graph.gridPos.h }} - }, - "type": "timeseries", - "title": "Memory Usage", - "datasource": "InfluxDB", - "pluginVersion": "8.2.1", - "options": { - "tooltip": { - "mode": "single" - }, - "legend": { - "displayMode": "table", - "placement": "right", - "calcs": [ - "max", - "mean", - "lastNotNull" - ] - } - }, - "targets": [ - { - "alias": "$tag_host $tag_role", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "host" - ], - "type": "tag" - }, - { - "params": [ - "role" - ], - "type": "tag" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "measurement": "mem", - "orderByTime": "ASC", - "policy": "default", - "queryType": "randomWalk", - "refId": "A", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "used_percent" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], - "tags": [ - { - "key": "host", - "operator": "=~", - "value": "/^$servername$/" - } - ] - } - ], - "fieldConfig": { - "defaults": { - "custom": { - "drawStyle": "line", - "lineInterpolation": "linear", - "barAlignment": 0, - "lineWidth": 1, - "fillOpacity": 0, - "gradientMode": "none", - "spanNulls": false, - "showPoints": "never", - "pointSize": 5, - "stacking": { - "mode": "none", - "group": "A" - }, - "axisPlacement": "auto", - "axisLabel": "", - "scaleDistribution": { - "type": "linear" - }, - "hideFrom": { - "tooltip": false, - "viz": false, - "legend": false - }, - "thresholdsStyle": { - "mode": "off" - } - }, - "color": { - "mode": "palette-classic" - }, - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green", - "value": null - } - ] - }, - "mappings": [], - "unit": "percent", - "min": 0, - "decimals": 1 - }, - "overrides": [] - }, - "interval": "30s", - "description": "", - "timeFrom": null, - "timeShift": null, - "maxDataPoints": null -} diff --git a/salt/grafana/panels/memory_used_docker_combined_current_graph.json.jinja b/salt/grafana/panels/memory_used_docker_combined_current_graph.json.jinja deleted file mode 100644 index 8a5ee72ce..000000000 --- a/salt/grafana/panels/memory_used_docker_combined_current_graph.json.jinja +++ /dev/null @@ -1,143 +0,0 @@ -{ - "id": 102, - "gridPos": { - "x": {{ PANELS.memory_used_docker_combined_current_graph.gridPos.x }}, - "y": {{ PANELS.memory_used_docker_combined_current_graph.gridPos.y }}, - "w": {{ PANELS.memory_used_docker_combined_current_graph.gridPos.w }}, - "h": {{ PANELS.memory_used_docker_combined_current_graph.gridPos.h }} - }, - "type": "timeseries", - "title": "Container Memory Usage Current", - "datasource": "InfluxDB", - "pluginVersion": "8.2.1", - "interval": "30s", - "options": { - "tooltip": { - "mode": "single" - }, - "legend": { - "displayMode": "table", - "placement": "right", - "calcs": [ - "max", - "mean", - "lastNotNull" - ] - } - }, - "targets": [ - { - "alias": "$tag_host: $tag_container_name", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "container_name" - ], - "type": "tag" - }, - { - "type": "tag", - "params": [ - "host" - ] - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "measurement": "docker_container_mem", - "orderByTime": "ASC", - "policy": "default", - "queryType": "randomWalk", - "refId": "A", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "usage_percent" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], - "tags": [ - { - "key": "host", - "operator": "=~", - "value": "/^$servername$/" - }, - { - "condition": "AND", - "key": "container_name", - "operator": "=~", - "value": "/^$containers$/" - } - ] - } - ], - "fieldConfig": { - "defaults": { - "custom": { - "drawStyle": "line", - "lineInterpolation": "linear", - "barAlignment": 0, - "lineWidth": 1, - "fillOpacity": 0, - "gradientMode": "none", - "spanNulls": false, - "showPoints": "never", - "pointSize": 5, - "stacking": { - "mode": "none", - "group": "A" - }, - "axisPlacement": "auto", - "axisLabel": "", - "scaleDistribution": { - "type": "linear" - }, - "hideFrom": { - "tooltip": false, - "viz": false, - "legend": false - }, - "thresholdsStyle": { - "mode": "off" - } - }, - "color": { - "mode": "palette-classic" - }, - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green", - "value": null - } - ] - }, - "mappings": [], - "unit": "percent", - "decimals": 1 - }, - "overrides": [] - }, - "maxDataPoints": null, - "timeFrom": null, - "timeShift": null -} diff --git a/salt/grafana/panels/memory_used_docker_combined_trend_graph.json.jinja b/salt/grafana/panels/memory_used_docker_combined_trend_graph.json.jinja deleted file mode 100644 index fb3aa402c..000000000 --- a/salt/grafana/panels/memory_used_docker_combined_trend_graph.json.jinja +++ /dev/null @@ -1,143 +0,0 @@ -{ - "id": 103, - "gridPos": { - "x": {{ PANELS.memory_used_docker_combined_trend_graph.gridPos.x }}, - "y": {{ PANELS.memory_used_docker_combined_trend_graph.gridPos.y }}, - "w": {{ PANELS.memory_used_docker_combined_trend_graph.gridPos.w }}, - "h": {{ PANELS.memory_used_docker_combined_trend_graph.gridPos.h }} - }, - "type": "timeseries", - "title": "Container Memory Usage Trend", - "datasource": "InfluxDB", - "pluginVersion": "8.2.1", - "maxDataPoints": 750, - "interval": "30s", - "options": { - "tooltip": { - "mode": "single" - }, - "legend": { - "displayMode": "table", - "placement": "right", - "calcs": [ - "max", - "mean", - "lastNotNull" - ] - } - }, - "targets": [ - { - "alias": "$tag_host: $tag_container_name", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "container_name" - ], - "type": "tag" - }, - { - "type": "tag", - "params": [ - "host" - ] - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "measurement": "docker_container_mem", - "orderByTime": "ASC", - "policy": "so_long_term", - "queryType": "randomWalk", - "refId": "A", - "resultFormat": "time_series", - "select": [ - [ - { - "type": "field", - "params": [ - "mean_usage_percent" - ] - }, - { - "type": "mean", - "params": [] - } - ] - ], - "tags": [ - { - "key": "host", - "operator": "=~", - "value": "/^$servername$/" - }, - { - "condition": "AND", - "key": "container_name", - "operator": "=~", - "value": "/^$containers$/" - } - ] - } - ], - "fieldConfig": { - "defaults": { - "custom": { - "drawStyle": "line", - "lineInterpolation": "linear", - "barAlignment": 0, - "lineWidth": 1, - "fillOpacity": 0, - "gradientMode": "none", - "spanNulls": true, - "showPoints": "never", - "pointSize": 5, - "stacking": { - "mode": "none", - "group": "A" - }, - "axisPlacement": "auto", - "axisLabel": "", - "scaleDistribution": { - "type": "linear" - }, - "hideFrom": { - "tooltip": false, - "viz": false, - "legend": false - }, - "thresholdsStyle": { - "mode": "off" - } - }, - "color": { - "mode": "palette-classic" - }, - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green", - "value": null - } - ] - }, - "mappings": [], - "unit": "percent", - "decimals": 1 - }, - "overrides": [] - }, - "timeFrom": null, - "timeShift": null -} diff --git a/salt/grafana/panels/monitor_interface_drops_graph.json.jinja b/salt/grafana/panels/monitor_interface_drops_graph.json.jinja deleted file mode 100644 index 993926156..000000000 --- a/salt/grafana/panels/monitor_interface_drops_graph.json.jinja +++ /dev/null @@ -1,282 +0,0 @@ -{ - "id": 61387, - "gridPos": { - "x": {{ PANELS.monitor_interface_drops_graph.gridPos.x }}, - "y": {{ PANELS.monitor_interface_drops_graph.gridPos.y }}, - "w": {{ PANELS.monitor_interface_drops_graph.gridPos.w }}, - "h": {{ PANELS.monitor_interface_drops_graph.gridPos.h }} - }, - "type": "timeseries", - "title": "Monitor Interface Drops", - "datasource": "InfluxDB", - "pluginVersion": "8.2.1", - "maxDataPoints": 750, - "interval": "30s", - "options": { - "tooltip": { - "mode": "single" - }, - "legend": { - "displayMode": "table", - "placement": "bottom", - "calcs": [ - "max", - "mean", - "lastNotNull" - ] - } - }, - "targets": [ - { - "alias": "$tag_host: $tag_interface: $col", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "orderByTime": "ASC", - "policy": "default", - "query": "SELECT non_negative_derivative(mean(drop_in), 1s) as \"in\" FROM \"net\" WHERE host =~ /$servername/ AND interface =~ /$monint/ AND $timeFilter GROUP BY time($__interval), host,interface fill(none)", - "queryType": "randomWalk", - "rawQuery": true, - "refId": "A", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "value" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], - "tags": [] - }, - { - "alias": "$tag_host: $tag_interface: $col", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "hide": false, - "orderByTime": "ASC", - "policy": "default", - "query": "SELECT non_negative_derivative(mean(drop_out), 1s) as \"out\" FROM \"net\" WHERE host =~ /$servername/ AND interface =~ /$monint/ AND $timeFilter GROUP BY time($__interval), host,interface fill(none)", - "rawQuery": true, - "refId": "B", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "value" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], - "tags": [] - }, - { - "alias": "$tag_host: $tag_interface: $col", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "hide": false, - "orderByTime": "ASC", - "policy": "default", - "query": "SELECT non_negative_derivative(mean(mean_drop_in), 1s) as \"trend_in\" FROM \"so_long_term\".\"net\" WHERE host =~ /$servername/ AND interface =~ /$monint/ AND $timeFilter GROUP BY time($__interval), host,interface fill(none)", - "queryType": "randomWalk", - "rawQuery": true, - "refId": "C", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "value" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], - "tags": [] - }, - { - "alias": "$tag_host: $tag_interface: $col", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "hide": false, - "orderByTime": "ASC", - "policy": "default", - "query": "SELECT non_negative_derivative(mean(mean_drop_out), 1s) as \"trend_out\" FROM \"so_long_term\".\"net\" WHERE host =~ /$servername/ AND interface =~ /$monint/ AND $timeFilter GROUP BY time($__interval), host,interface fill(none)", - "rawQuery": true, - "refId": "D", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "value" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], - "tags": [] - } - ], - "fieldConfig": { - "defaults": { - "custom": { - "drawStyle": "line", - "lineInterpolation": "linear", - "barAlignment": 0, - "lineWidth": 1, - "fillOpacity": 10, - "gradientMode": "none", - "spanNulls": false, - "showPoints": "never", - "pointSize": 5, - "stacking": { - "mode": "none", - "group": "A" - }, - "axisPlacement": "auto", - "axisLabel": "Drops per second", - "scaleDistribution": { - "type": "linear" - }, - "hideFrom": { - "tooltip": false, - "viz": false, - "legend": false - }, - "thresholdsStyle": { - "mode": "off" - } - }, - "color": { - "mode": "palette-classic" - }, - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green", - "value": null - } - ] - }, - "mappings": [], - "unit": "pps", - "min": 0, - "decimals": 1 - }, - "overrides": [ - { - "matcher": { - "id": "byRegexp", - "options": "/trend/" - }, - "properties": [ - { - "id": "custom.fillOpacity", - "value": 0 - }, - { - "id": "custom.lineWidth", - "value": 4 - }, - { - "id": "custom.lineStyle", - "value": { - "fill": "dash", - "dash": [ - 4, - 10 - ] - } - } - ] - }, - { - "matcher": { - "id": "byRegexp", - "options": "/veth/" - }, - "properties": [ - { - "id": "custom.hideFrom", - "value": { - "tooltip": true, - "viz": true, - "legend": true - } - } - ] - } - ] - }, - "timeFrom": null, - "timeShift": null -} diff --git a/salt/grafana/panels/monitor_interface_drops_inbound_graph.json.jinja b/salt/grafana/panels/monitor_interface_drops_inbound_graph.json.jinja deleted file mode 100644 index 2c4574f84..000000000 --- a/salt/grafana/panels/monitor_interface_drops_inbound_graph.json.jinja +++ /dev/null @@ -1,125 +0,0 @@ -{ - "id": 188190, - "gridPos": { - "x": {{ PANELS.monitor_interface_drops_inbound_graph.gridPos.x }}, - "y": {{ PANELS.monitor_interface_drops_inbound_graph.gridPos.y }}, - "w": {{ PANELS.monitor_interface_drops_inbound_graph.gridPos.w }}, - "h": {{ PANELS.monitor_interface_drops_inbound_graph.gridPos.h }} - }, - "type": "timeseries", - "title": "Monitor Interface Drops - Inbound", - "datasource": "InfluxDB", - "pluginVersion": "8.2.1", - "interval": "30s", - "fieldConfig": { - "defaults": { - "custom": { - "drawStyle": "line", - "lineInterpolation": "linear", - "barAlignment": 0, - "lineWidth": 1, - "fillOpacity": 0, - "gradientMode": "none", - "spanNulls": false, - "showPoints": "never", - "pointSize": 5, - "stacking": { - "mode": "none", - "group": "A" - }, - "axisPlacement": "auto", - "axisLabel": "Drops per second", - "scaleDistribution": { - "type": "linear" - }, - "hideFrom": { - "tooltip": false, - "viz": false, - "legend": false - }, - "thresholdsStyle": { - "mode": "off" - } - }, - "color": { - "mode": "palette-classic" - }, - "thresholds": { - "mode": "absolute", - "steps": [ - { - "value": null, - "color": "green" - }, - { - "value": 80, - "color": "red" - } - ] - }, - "mappings": [], - "unit": "pps", - "min": 0, - "decimals": 1 - }, - "overrides": [] - }, - "options": { - "tooltip": { - "mode": "single" - }, - "legend": { - "displayMode": "table", - "placement": "right", - "calcs": [ - "max", - "mean", - "lastNotNull" - ] - } - }, - "targets": [ - { - "alias": "$tag_host: $tag_role", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "orderByTime": "ASC", - "policy": "default", - "query": "SELECT non_negative_derivative(mean(drop_in), 1s) as \"in\" FROM \"net\" WHERE host =~ /$servername/ AND interface =~ /$monint/ AND $timeFilter GROUP BY time($__interval), host,role fill(none)", - "queryType": "randomWalk", - "rawQuery": true, - "refId": "A", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "value" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], - "tags": [] - } - ], - "maxDataPoints": null, - "timeFrom": null, - "timeShift": null -} diff --git a/salt/grafana/panels/monitor_interface_packets_graph.json.jinja b/salt/grafana/panels/monitor_interface_packets_graph.json.jinja deleted file mode 100644 index 4c44fdb87..000000000 --- a/salt/grafana/panels/monitor_interface_packets_graph.json.jinja +++ /dev/null @@ -1,282 +0,0 @@ -{ - "id": 61878, - "gridPos": { - "x": {{ PANELS.monitor_interface_packets_graph.gridPos.x }}, - "y": {{ PANELS.monitor_interface_packets_graph.gridPos.y }}, - "w": {{ PANELS.monitor_interface_packets_graph.gridPos.w }}, - "h": {{ PANELS.monitor_interface_packets_graph.gridPos.h }} - }, - "type": "timeseries", - "title": "Monitor Interface Packets", - "datasource": "InfluxDB", - "pluginVersion": "8.2.1", - "maxDataPoints": 750, - "interval": "30s", - "options": { - "tooltip": { - "mode": "single" - }, - "legend": { - "displayMode": "table", - "placement": "bottom", - "calcs": [ - "max", - "mean", - "last" - ] - } - }, - "targets": [ - { - "alias": "$tag_host: $tag_interface: $col", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "orderByTime": "ASC", - "policy": "default", - "query": "SELECT non_negative_derivative(mean(packets_recv), 1s) as \"in\" FROM \"net\" WHERE host =~ /$servername/ AND interface =~ /$monint/ AND $timeFilter GROUP BY time($__interval), * fill(none)", - "queryType": "randomWalk", - "rawQuery": true, - "refId": "A", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "value" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], - "tags": [] - }, - { - "alias": "$tag_host: $tag_interface: $col", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "hide": false, - "orderByTime": "ASC", - "policy": "default", - "query": "SELECT non_negative_derivative(mean(packets_sent), 1s) as \"out\" FROM \"net\" WHERE host =~ /$servername/ AND interface =~ /$monint/ AND $timeFilter GROUP BY time($__interval), * fill(none)", - "rawQuery": true, - "refId": "B", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "value" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], - "tags": [] - }, - { - "alias": "$tag_host: $tag_interface: $col", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "hide": false, - "orderByTime": "ASC", - "policy": "default", - "query": "SELECT non_negative_derivative(mean(mean_packets_recv), 1s) as \"trend_in\" FROM \"so_long_term\".\"net\" WHERE host =~ /$servername/ AND interface =~ /$monint/ AND $timeFilter GROUP BY time($__interval), * fill(none)", - "queryType": "randomWalk", - "rawQuery": true, - "refId": "C", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "value" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], - "tags": [] - }, - { - "alias": "$tag_host: $tag_interface: $col", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "hide": false, - "orderByTime": "ASC", - "policy": "default", - "query": "SELECT non_negative_derivative(mean(mean_packets_sent), 1s) as \"trend_out\" FROM \"so_long_term\".\"net\" WHERE host =~ /$servername/ AND interface =~ /$monint/ AND $timeFilter GROUP BY time($__interval), * fill(none)", - "rawQuery": true, - "refId": "D", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "value" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], - "tags": [] - } - ], - "fieldConfig": { - "defaults": { - "custom": { - "drawStyle": "line", - "lineInterpolation": "linear", - "barAlignment": 0, - "lineWidth": 1, - "fillOpacity": 10, - "gradientMode": "none", - "spanNulls": false, - "showPoints": "never", - "pointSize": 5, - "stacking": { - "mode": "none", - "group": "A" - }, - "axisPlacement": "auto", - "axisLabel": "Packets per second", - "scaleDistribution": { - "type": "linear" - }, - "hideFrom": { - "tooltip": false, - "viz": false, - "legend": false - }, - "thresholdsStyle": { - "mode": "off" - } - }, - "color": { - "mode": "palette-classic" - }, - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green", - "value": null - } - ] - }, - "mappings": [], - "unit": "pps", - "min": 0, - "decimals": 1 - }, - "overrides": [ - { - "matcher": { - "id": "byRegexp", - "options": "/trend/" - }, - "properties": [ - { - "id": "custom.fillOpacity", - "value": 0 - }, - { - "id": "custom.lineWidth", - "value": 4 - }, - { - "id": "custom.lineStyle", - "value": { - "fill": "dash", - "dash": [ - 4, - 10 - ] - } - } - ] - }, - { - "matcher": { - "id": "byRegexp", - "options": "/veth/" - }, - "properties": [ - { - "id": "custom.hideFrom", - "value": { - "tooltip": true, - "viz": true, - "legend": true - } - } - ] - } - ] - }, - "timeFrom": null, - "timeShift": null -} diff --git a/salt/grafana/panels/monitor_interface_traffic_both_graph.json.jinja b/salt/grafana/panels/monitor_interface_traffic_both_graph.json.jinja deleted file mode 100644 index 3c1a6fc74..000000000 --- a/salt/grafana/panels/monitor_interface_traffic_both_graph.json.jinja +++ /dev/null @@ -1,276 +0,0 @@ -{ - "id": 10, - "gridPos": { - "x": {{ PANELS.monitor_interface_traffic_both_graph.gridPos.x }}, - "y": {{ PANELS.monitor_interface_traffic_both_graph.gridPos.y }}, - "w": {{ PANELS.monitor_interface_traffic_both_graph.gridPos.w }}, - "h": {{ PANELS.monitor_interface_traffic_both_graph.gridPos.h }} - }, - "type": "timeseries", - "title": "Monitor Interface Traffic", - "datasource": "InfluxDB", - "pluginVersion": "8.2.1", - "interval": "30s", - "links": [], - "fieldConfig": { - "defaults": { - "custom": { - "drawStyle": "line", - "lineInterpolation": "linear", - "barAlignment": 0, - "lineWidth": 2, - "fillOpacity": 10, - "gradientMode": "none", - "spanNulls": false, - "showPoints": "never", - "pointSize": 5, - "stacking": { - "mode": "none", - "group": "A" - }, - "axisPlacement": "auto", - "axisLabel": "", - "scaleDistribution": { - "type": "linear" - }, - "hideFrom": { - "tooltip": false, - "viz": false, - "legend": false - }, - "thresholdsStyle": { - "mode": "off" - } - }, - "color": { - "mode": "palette-classic" - }, - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green", - "value": null - } - ] - }, - "mappings": [], - "links": [], - "unit": "bps", - "decimals": 1 - }, - "overrides": [ - { - "matcher": { - "id": "byRegexp", - "options": "/Trend/" - }, - "properties": [ - { - "id": "custom.fillOpacity", - "value": 0 - }, - { - "id": "custom.lineWidth", - "value": 4 - }, - { - "id": "custom.lineStyle", - "value": { - "dash": [ - 4, - 10 - ], - "fill": "dash" - } - } - ] - }, - { - "matcher": { - "id": "byRegexp", - "options": "/veth/" - }, - "properties": [ - { - "id": "custom.hideFrom", - "value": { - "tooltip": true, - "viz": true, - "legend": true - } - } - ] - } - ] - }, - "options": { - "tooltip": { - "mode": "single" - }, - "legend": { - "displayMode": "table", - "placement": "right", - "calcs": [ - "max", - "mean", - "last" - ] - } - }, - "targets": [ - { - "alias": "$tag_host: $tag_interface: RX Current", - "dsType": "influxdb", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "host" - ], - "type": "tag" - }, - { - "params": [ - "interface" - ], - "type": "tag" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "measurement": "net", - "orderByTime": "ASC", - "policy": "default", - "refId": "A", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "bytes_recv" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - }, - { - "params": [ - "1s" - ], - "type": "non_negative_derivative" - }, - { - "params": [ - "*8" - ], - "type": "math" - } - ] - ], - "tags": [ - { - "key": "host", - "operator": "=~", - "value": "/^$servername$/" - }, - { - "condition": "AND", - "key": "interface", - "operator": "=~", - "value": "/^$monint$/" - } - ] - }, - { - "alias": "$tag_host: $tag_interface: RX Trend", - "dsType": "influxdb", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "host" - ], - "type": "tag" - }, - { - "params": [ - "interface" - ], - "type": "tag" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "hide": false, - "measurement": "net", - "orderByTime": "ASC", - "policy": "so_long_term", - "refId": "B", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "mean_bytes_recv" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - }, - { - "params": [ - "1s" - ], - "type": "non_negative_derivative" - }, - { - "params": [ - "*8" - ], - "type": "math" - } - ] - ], - "tags": [ - { - "key": "host", - "operator": "=~", - "value": "/^$servername$/" - }, - { - "condition": "AND", - "key": "interface", - "operator": "=~", - "value": "/^$monint$/" - } - ] - } - ], - "description": "", - "maxDataPoints": null, - "timeFrom": null, - "timeShift": null -} diff --git a/salt/grafana/panels/monitor_interface_traffic_inbound_graph.json.jinja b/salt/grafana/panels/monitor_interface_traffic_inbound_graph.json.jinja deleted file mode 100644 index 5365bd3ac..000000000 --- a/salt/grafana/panels/monitor_interface_traffic_inbound_graph.json.jinja +++ /dev/null @@ -1,167 +0,0 @@ -{ - "id": 188188, - "gridPos": { - "x": {{ PANELS.monitor_interface_traffic_inbound_graph.gridPos.x }}, - "y": {{ PANELS.monitor_interface_traffic_inbound_graph.gridPos.y }}, - "w": {{ PANELS.monitor_interface_traffic_inbound_graph.gridPos.w }}, - "h": {{ PANELS.monitor_interface_traffic_inbound_graph.gridPos.h }} - }, - "type": "timeseries", - "title": "Monitor Interface Traffic - Inbound", - "datasource": "InfluxDB", - "pluginVersion": "8.2.1", - "interval": "30s", - "links": [], - "fieldConfig": { - "defaults": { - "custom": { - "drawStyle": "line", - "lineInterpolation": "linear", - "barAlignment": 0, - "lineWidth": 2, - "fillOpacity": 0, - "gradientMode": "none", - "spanNulls": false, - "showPoints": "never", - "pointSize": 5, - "stacking": { - "mode": "none", - "group": "A" - }, - "axisPlacement": "auto", - "axisLabel": "", - "scaleDistribution": { - "type": "linear" - }, - "hideFrom": { - "tooltip": false, - "viz": false, - "legend": false - }, - "thresholdsStyle": { - "mode": "off" - }, - "lineStyle": { - "fill": "solid" - } - }, - "color": { - "mode": "palette-classic" - }, - "thresholds": { - "mode": "absolute", - "steps": [ - { - "value": null, - "color": "green" - }, - { - "value": 80, - "color": "red" - } - ] - }, - "mappings": [], - "links": [], - "unit": "bps", - "decimals": 1, - "min": 0 - }, - "overrides": [] - }, - "options": { - "tooltip": { - "mode": "single" - }, - "legend": { - "displayMode": "table", - "placement": "right", - "calcs": [ - "max", - "mean", - "lastNotNull" - ] - } - }, - "targets": [ - { - "alias": "$tag_host $tag_role", - "dsType": "influxdb", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "host" - ], - "type": "tag" - }, - { - "params": [ - "role" - ], - "type": "tag" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "measurement": "net", - "orderByTime": "ASC", - "policy": "default", - "query": "SELECT non_negative_derivative(mean(\"bytes_recv\"), 1s) *8 FROM \"net\" WHERE (\"host\" = '$servername' AND \"interface\" = '$monint') AND $timeFilter GROUP BY time($__interval) fill(null)", - "rawQuery": false, - "refId": "A", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "bytes_recv" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - }, - { - "params": [ - "1s" - ], - "type": "non_negative_derivative" - }, - { - "params": [ - "*8" - ], - "type": "math" - } - ] - ], - "tags": [ - { - "key": "host", - "operator": "=~", - "value": "/^$servername$/" - }, - { - "condition": "AND", - "key": "interface", - "operator": "=~", - "value": "/^$monint$/" - } - ] - } - ], - "maxDataPoints": null, - "timeFrom": null, - "timeShift": null -} diff --git a/salt/grafana/panels/monitor_interface_traffic_inbound_total_graph.json.jinja b/salt/grafana/panels/monitor_interface_traffic_inbound_total_graph.json.jinja deleted file mode 100644 index 67e92668d..000000000 --- a/salt/grafana/panels/monitor_interface_traffic_inbound_total_graph.json.jinja +++ /dev/null @@ -1,178 +0,0 @@ -{ - "id": 224244, - "gridPos": { - "x": {{ PANELS.monitor_interface_traffic_inbound_total_graph.gridPos.x }}, - "y": {{ PANELS.monitor_interface_traffic_inbound_total_graph.gridPos.y }}, - "w": {{ PANELS.monitor_interface_traffic_inbound_total_graph.gridPos.w }}, - "h": {{ PANELS.monitor_interface_traffic_inbound_total_graph.gridPos.h }} - }, - "type": "timeseries", - "title": "Monitor Traffic - Selected Total", - "transformations": [ - { - "id": "calculateField", - "options": { - "alias": "Total Monitor Traffic", - "mode": "reduceRow", - "reduce": { - "reducer": "sum" - }, - "replaceFields": true - } - } - ], - "datasource": "InfluxDB", - "pluginVersion": "8.2.1", - "links": [], - "fieldConfig": { - "defaults": { - "custom": { - "drawStyle": "line", - "lineInterpolation": "linear", - "barAlignment": 0, - "lineWidth": 1, - "fillOpacity": 0, - "gradientMode": "none", - "spanNulls": false, - "showPoints": "auto", - "pointSize": 5, - "stacking": { - "mode": "none", - "group": "A" - }, - "axisPlacement": "auto", - "axisLabel": "", - "scaleDistribution": { - "type": "linear" - }, - "hideFrom": { - "tooltip": false, - "viz": false, - "legend": false - }, - "thresholdsStyle": { - "mode": "off" - } - }, - "color": { - "mode": "palette-classic" - }, - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "rgba(245, 54, 54, 0.9)", - "value": null - }, - { - "color": "rgba(50, 172, 45, 0.97)", - "value": 1 - } - ] - }, - "mappings": [ - { - "options": { - "match": "null", - "result": { - "text": "N/A" - } - }, - "type": "special" - } - ], - "decimals": 1, - "unit": "bps" - }, - "overrides": [] - }, - "interval": "30s", - "options": { - "tooltip": { - "mode": "single" - }, - "legend": { - "displayMode": "table", - "placement": "right", - "calcs": [ - "max", - "mean", - "lastNotNull" - ] - } - }, - "targets": [ - { - "dsType": "influxdb", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "host" - ], - "type": "tag" - }, - { - "params": [ - "none" - ], - "type": "fill" - } - ], - "measurement": "net", - "orderByTime": "ASC", - "policy": "default", - "query": "SELECT non_negative_derivative(mean(\"bytes_recv\"), 1s) *8 FROM \"net\" WHERE (\"host\" =~ /^$servername$/ AND \"interface\" = '$monint') AND $timeFilter GROUP BY time($__interval) fill(null)", - "rawQuery": false, - "refId": "A", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "bytes_recv" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - }, - { - "params": [ - "1s" - ], - "type": "non_negative_derivative" - }, - { - "params": [ - "*8" - ], - "type": "math" - } - ] - ], - "tags": [ - { - "key": "host", - "operator": "=~", - "value": "/^$servername$/" - }, - { - "condition": "AND", - "key": "interface", - "operator": "=~", - "value": "/^$monint$/" - } - ] - } - ], - "cacheTimeout": null, - "description": "", - "maxDataPoints": null -} diff --git a/salt/grafana/panels/monitor_interface_traffic_stat.json.jinja b/salt/grafana/panels/monitor_interface_traffic_stat.json.jinja deleted file mode 100644 index 283d93f7a..000000000 --- a/salt/grafana/panels/monitor_interface_traffic_stat.json.jinja +++ /dev/null @@ -1,152 +0,0 @@ -{ - "id": 24, - "gridPos": { - "x": {{ PANELS.monitor_interface_traffic_stat.gridPos.x }}, - "y": {{ PANELS.monitor_interface_traffic_stat.gridPos.y }}, - "w": {{ PANELS.monitor_interface_traffic_stat.gridPos.w }}, - "h": {{ PANELS.monitor_interface_traffic_stat.gridPos.h }} - }, - "type": "stat", - "title": "Monitor Traffic - Selected Total", - "datasource": "InfluxDB", - "pluginVersion": "8.2.1", - "interval": "30s", - "links": [], - "fieldConfig": { - "defaults": { - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "rgba(245, 54, 54, 0.9)", - "value": null - }, - { - "color": "rgba(50, 172, 45, 0.97)", - "value": 1 - } - ] - }, - "mappings": [ - { - "options": { - "match": "null", - "result": { - "text": "N/A" - } - }, - "type": "special" - } - ], - "color": { - "mode": "thresholds" - }, - "decimals": 2, - "unit": "bps" - }, - "overrides": [] - }, - "options": { - "reduceOptions": { - "values": false, - "calcs": [ - "lastNotNull" - ], - "fields": "" - }, - "orientation": "horizontal", - "text": {}, - "textMode": "value", - "colorMode": "value", - "graphMode": "area", - "justifyMode": "auto" - }, - "targets": [ - { - "dsType": "influxdb", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "type": "tag", - "params": [ - "host" - ] - }, - { - "params": [ - "none" - ], - "type": "fill" - } - ], - "measurement": "net", - "orderByTime": "ASC", - "policy": "default", - "refId": "A", - "resultFormat": "time_series", - "select": [ - [ - { - "type": "field", - "params": [ - "bytes_recv" - ] - }, - { - "type": "mean", - "params": [] - }, - { - "type": "non_negative_derivative", - "params": [ - "1s" - ] - }, - { - "type": "math", - "params": [ - "*8" - ] - } - ] - ], - "tags": [ - { - "key": "host", - "operator": "=~", - "value": "/^$servername$/" - }, - { - "condition": "AND", - "key": "interface", - "operator": "=~", - "value": "/^$monint$/" - } - ], - "query": "SELECT non_negative_derivative(mean(\"bytes_recv\"), 1s) *8 FROM \"net\" WHERE (\"host\" =~ /^$servername$/ AND \"interface\" = '$monint') AND $timeFilter GROUP BY time($__interval) fill(null)", - "rawQuery": false - } - ], - "maxDataPoints": null, - "cacheTimeout": null, - "interval": null, - "transformations": [ - { - "id": "calculateField", - "options": { - "mode": "reduceRow", - "reduce": { - "reducer": "sum" - }, - "alias": "Monitor Traffic", - "replaceFields": true - } - } - ], - "description": "" -} diff --git a/salt/grafana/panels/network_usage_docker_combined_current_graph.json.jinja b/salt/grafana/panels/network_usage_docker_combined_current_graph.json.jinja deleted file mode 100644 index 9a9d81504..000000000 --- a/salt/grafana/panels/network_usage_docker_combined_current_graph.json.jinja +++ /dev/null @@ -1,232 +0,0 @@ -{ - "id": 61868, - "gridPos": { - "x": {{ PANELS.network_usage_docker_combined_current_graph.gridPos.x }}, - "y": {{ PANELS.network_usage_docker_combined_current_graph.gridPos.y }}, - "w": {{ PANELS.network_usage_docker_combined_current_graph.gridPos.w }}, - "h": {{ PANELS.network_usage_docker_combined_current_graph.gridPos.h }} - }, - "type": "timeseries", - "title": "Container Network Usage Current", - "datasource": "InfluxDB", - "pluginVersion": "8.2.1", - "interval": "30s", - "options": { - "tooltip": { - "mode": "single" - }, - "legend": { - "displayMode": "table", - "placement": "right", - "calcs": [ - "max", - "mean", - "lastNotNull" - ] - } - }, - "targets": [ - { - "alias": "$tag_host: $tag_container_name RX", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "container_name" - ], - "type": "tag" - }, - { - "type": "tag", - "params": [ - "host" - ] - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "measurement": "docker_container_net", - "orderByTime": "ASC", - "policy": "default", - "queryType": "randomWalk", - "refId": "A", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "rx_bytes" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - }, - { - "params": [ - "1s" - ], - "type": "non_negative_derivative" - }, - { - "params": [ - "*8" - ], - "type": "math" - } - ] - ], - "tags": [ - { - "key": "host", - "operator": "=~", - "value": "/^$servername$/" - }, - { - "condition": "AND", - "key": "container_name", - "operator": "=~", - "value": "/^$containers$/" - } - ], - "hide": false - }, - { - "alias": "$tag_host: $tag_container_name TX", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "container_name" - ], - "type": "tag" - }, - { - "type": "tag", - "params": [ - "host" - ] - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "hide": false, - "measurement": "docker_container_net", - "orderByTime": "ASC", - "policy": "default", - "queryType": "randomWalk", - "refId": "B", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "tx_bytes" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - }, - { - "params": [ - "1s" - ], - "type": "non_negative_derivative" - }, - { - "params": [ - "*8" - ], - "type": "math" - } - ] - ], - "tags": [ - { - "key": "host", - "operator": "=~", - "value": "/^$servername$/" - }, - { - "condition": "AND", - "key": "container_name", - "operator": "=~", - "value": "/^$containers$/" - } - ] - } - ], - "fieldConfig": { - "defaults": { - "custom": { - "drawStyle": "line", - "lineInterpolation": "linear", - "barAlignment": 0, - "lineWidth": 1, - "fillOpacity": 5, - "gradientMode": "none", - "spanNulls": true, - "showPoints": "never", - "pointSize": 5, - "stacking": { - "mode": "none", - "group": "A" - }, - "axisPlacement": "auto", - "axisLabel": "", - "scaleDistribution": { - "type": "linear" - }, - "hideFrom": { - "tooltip": false, - "viz": false, - "legend": false - }, - "thresholdsStyle": { - "mode": "off" - } - }, - "color": { - "mode": "palette-classic" - }, - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green", - "value": null - } - ] - }, - "mappings": [], - "unit": "bps", - "decimals": 1 - }, - "overrides": [] - }, - "maxDataPoints": null, - "description": "", - "timeFrom": null, - "timeShift": null -} diff --git a/salt/grafana/panels/network_usage_docker_combined_trend_graph.json.jinja b/salt/grafana/panels/network_usage_docker_combined_trend_graph.json.jinja deleted file mode 100644 index b8dc975d8..000000000 --- a/salt/grafana/panels/network_usage_docker_combined_trend_graph.json.jinja +++ /dev/null @@ -1,231 +0,0 @@ -{ - "id": 61461, - "gridPos": { - "x": {{ PANELS.network_usage_docker_combined_trend_graph.gridPos.x }}, - "y": {{ PANELS.network_usage_docker_combined_trend_graph.gridPos.y }}, - "w": {{ PANELS.network_usage_docker_combined_trend_graph.gridPos.w }}, - "h": {{ PANELS.network_usage_docker_combined_trend_graph.gridPos.h }} - }, - "type": "timeseries", - "title": "Container Network Usage Trend", - "datasource": "InfluxDB", - "pluginVersion": "8.2.1", - "interval": "5m", - "options": { - "tooltip": { - "mode": "single" - }, - "legend": { - "displayMode": "table", - "placement": "right", - "calcs": [ - "max", - "mean", - "lastNotNull" - ] - } - }, - "targets": [ - { - "alias": "$tag_host: $tag_container_name RX", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "container_name" - ], - "type": "tag" - }, - { - "type": "tag", - "params": [ - "host" - ] - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "measurement": "docker_container_net", - "orderByTime": "ASC", - "policy": "so_long_term", - "queryType": "randomWalk", - "refId": "A", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "mean_rx_bytes" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - }, - { - "params": [ - "1s" - ], - "type": "non_negative_derivative" - }, - { - "params": [ - "*8" - ], - "type": "math" - } - ] - ], - "tags": [ - { - "key": "host", - "operator": "=~", - "value": "/^$servername$/" - }, - { - "condition": "AND", - "key": "container_name", - "operator": "=~", - "value": "/^$containers$/" - } - ] - }, - { - "alias": "$tag_host: $tag_container_name TX", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "container_name" - ], - "type": "tag" - }, - { - "type": "tag", - "params": [ - "host" - ] - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "hide": false, - "measurement": "docker_container_net", - "orderByTime": "ASC", - "policy": "so_long_term", - "queryType": "randomWalk", - "refId": "B", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "mean_tx_bytes" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - }, - { - "params": [ - "1s" - ], - "type": "non_negative_derivative" - }, - { - "params": [ - "*8" - ], - "type": "math" - } - ] - ], - "tags": [ - { - "key": "host", - "operator": "=~", - "value": "/^$servername$/" - }, - { - "condition": "AND", - "key": "container_name", - "operator": "=~", - "value": "/^$containers$/" - } - ] - } - ], - "fieldConfig": { - "defaults": { - "custom": { - "drawStyle": "line", - "lineInterpolation": "linear", - "barAlignment": 0, - "lineWidth": 1, - "fillOpacity": 5, - "gradientMode": "none", - "spanNulls": false, - "showPoints": "never", - "pointSize": 5, - "stacking": { - "mode": "none", - "group": "A" - }, - "axisPlacement": "auto", - "axisLabel": "", - "scaleDistribution": { - "type": "linear" - }, - "hideFrom": { - "tooltip": false, - "viz": false, - "legend": false - }, - "thresholdsStyle": { - "mode": "off" - } - }, - "color": { - "mode": "palette-classic" - }, - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green", - "value": null - } - ] - }, - "mappings": [], - "unit": "bps", - "decimals": 1 - }, - "overrides": [] - }, - "maxDataPoints": null, - "description": "", - "timeFrom": null, - "timeShift": null -} diff --git a/salt/grafana/panels/nsm_used_guage.json.jinja b/salt/grafana/panels/nsm_used_guage.json.jinja deleted file mode 100644 index 3175d3bfd..000000000 --- a/salt/grafana/panels/nsm_used_guage.json.jinja +++ /dev/null @@ -1,121 +0,0 @@ -{ - "id": 12, - "gridPos": { - "x": {{ PANELS.nsm_used_guage.gridPos.x }}, - "y": {{ PANELS.nsm_used_guage.gridPos.y }}, - "w": {{ PANELS.nsm_used_guage.gridPos.w }}, - "h": {{ PANELS.nsm_used_guage.gridPos.h }} - }, - "type": "gauge", - "title": "NSM used", - "datasource": "InfluxDB", - "pluginVersion": "8.2.1", - "links": [], - "fieldConfig": { - "defaults": { - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "rgba(50, 172, 45, 0.97)", - "value": null - }, - { - "color": "rgba(237, 129, 40, 0.89)", - "value": 85 - }, - { - "color": "rgba(245, 54, 54, 0.9)", - "value": 95 - } - ] - }, - "mappings": [ - { - "options": { - "match": "null", - "result": { - "text": "N/A" - } - }, - "type": "special" - } - ], - "color": { - "mode": "thresholds" - }, - "decimals": 0, - "max": 100, - "min": 0, - "unit": "percent" - }, - "overrides": [] - }, - "interval": "30", - "options": { - "reduceOptions": { - "values": false, - "calcs": [ - "lastNotNull" - ], - "fields": "" - }, - "orientation": "horizontal", - "showThresholdLabels": false, - "showThresholdMarkers": true, - "text": {} - }, - "targets": [ - { - "dsType": "influxdb", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "measurement": "disk", - "orderByTime": "ASC", - "policy": "default", - "refId": "A", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "used_percent" - ], - "type": "field" - }, - { - "params": [], - "type": "last" - } - ] - ], - "tags": [ - { - "key": "host", - "operator": "=", - "value": "$servername" - }, - { - "condition": "AND", - "key": "path", - "operator": "=", - "value": "/nsm" - } - ] - } - ], - "maxDataPoints": null, - "cacheTimeout": null -} diff --git a/salt/grafana/panels/pcap_retention_stat.json.jinja b/salt/grafana/panels/pcap_retention_stat.json.jinja deleted file mode 100644 index 138b18e6b..000000000 --- a/salt/grafana/panels/pcap_retention_stat.json.jinja +++ /dev/null @@ -1,113 +0,0 @@ -{ - "id": 26, - "gridPos": { - "x": {{ PANELS.pcap_retention_stat.gridPos.x }}, - "y": {{ PANELS.pcap_retention_stat.gridPos.y }}, - "w": {{ PANELS.pcap_retention_stat.gridPos.w }}, - "h": {{ PANELS.pcap_retention_stat.gridPos.h }} - }, - "type": "stat", - "title": "PCAP Retention", - "datasource": "InfluxDB", - "pluginVersion": "8.2.1", - "links": [], - "fieldConfig": { - "defaults": { - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green", - "value": null - } - ] - }, - "mappings": [ - { - "options": { - "match": "null", - "result": { - "text": "N/A" - } - }, - "type": "special" - } - ], - "color": { - "mode": "thresholds" - }, - "decimals": 2, - "unit": "d" - }, - "overrides": [] - }, - "interval": "30", - "options": { - "reduceOptions": { - "values": false, - "calcs": [ - "lastNotNull" - ], - "fields": "" - }, - "orientation": "horizontal", - "text": {}, - "textMode": "value", - "colorMode": "value", - "graphMode": "none", - "justifyMode": "auto" - }, - "targets": [ - { - "dsType": "influxdb", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "measurement": "pcapage", - "orderByTime": "ASC", - "policy": "default", - "refId": "A", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "seconds" - ], - "type": "field" - }, - { - "params": [], - "type": "last" - }, - { - "params": [ - "/86400" - ], - "type": "math" - } - ] - ], - "tags": [ - { - "key": "host", - "operator": "=", - "value": "$servername" - } - ] - } - ], - "maxDataPoints": null, - "cacheTimeout": null -} diff --git a/salt/grafana/panels/process_status_graph.json.jinja b/salt/grafana/panels/process_status_graph.json.jinja deleted file mode 100644 index 302175c36..000000000 --- a/salt/grafana/panels/process_status_graph.json.jinja +++ /dev/null @@ -1,203 +0,0 @@ -{ - "id": 61852, - "gridPos": { - "x": {{ PANELS.process_status_graph.gridPos.x }}, - "y": {{ PANELS.process_status_graph.gridPos.y }}, - "w": {{ PANELS.process_status_graph.gridPos.w }}, - "h": {{ PANELS.process_status_graph.gridPos.h }} - }, - "type": "timeseries", - "title": "Process Status", - "datasource": "InfluxDB", - "pluginVersion": "8.2.1", - "interval": "30s", - "links": [], - "fieldConfig": { - "defaults": { - "custom": { - "drawStyle": "line", - "lineInterpolation": "linear", - "barAlignment": 0, - "lineWidth": 1, - "fillOpacity": 10, - "gradientMode": "none", - "spanNulls": false, - "showPoints": "never", - "pointSize": 5, - "stacking": { - "mode": "none", - "group": "A" - }, - "axisPlacement": "auto", - "axisLabel": "", - "scaleDistribution": { - "type": "linear" - }, - "hideFrom": { - "tooltip": false, - "viz": false, - "legend": false - }, - "thresholdsStyle": { - "mode": "off" - } - }, - "color": { - "mode": "palette-classic" - }, - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green", - "value": null - } - ] - }, - "mappings": [], - "links": [], - "unit": "short", - "decimals": 1 - }, - "overrides": [ - { - "matcher": { - "id": "byRegexp", - "options": "/trend/" - }, - "properties": [ - { - "id": "custom.fillOpacity", - "value": 0 - }, - { - "id": "custom.lineWidth", - "value": 4 - }, - { - "id": "custom.lineStyle", - "value": { - "fill": "dash", - "dash": [ - 4, - 10 - ] - } - } - ] - } - ] - }, - "options": { - "tooltip": { - "mode": "single" - }, - "legend": { - "displayMode": "table", - "placement": "bottom", - "calcs": [ - "max", - "mean", - "lastNotNull" - ] - } - }, - "targets": [ - { - "alias": "$tag_host: $col", - "dsType": "influxdb", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "measurement": "processes", - "orderByTime": "ASC", - "policy": "default", - "query": "SELECT mean(running) as running, mean(blocked) as blocked, mean(sleeping) as sleeping, mean(stopped) as stopped, mean(zombies) as zombies, mean(paging) as paging, mean(unknown) as unknown FROM \"processes\" WHERE host =~ /$servername$/ AND $timeFilter GROUP BY time($__interval), host ORDER BY asc", - "rawQuery": true, - "refId": "B", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "blocked" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], - "tags": [ - { - "key": "host", - "operator": "=~", - "value": "/^$server$/" - } - ] - }, - { - "alias": "$tag_host: $col", - "dsType": "influxdb", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "hide": false, - "measurement": "processes", - "orderByTime": "ASC", - "policy": "default", - "query": "SELECT mean(mean_running) as trend_running, mean(mean_blocked) as trend_blocked, mean(mean_sleeping) as trend_sleeping, mean(mean_stopped) as trend_stopped, mean(mean_zombies) as trend_zombies, mean(mean_paging) as trend_paging, mean(mean_unknown) as trend_unknown FROM \"so_long_term\".\"processes\" WHERE host =~ /$servername$/ AND $timeFilter GROUP BY time($__interval), host fill(linear) ORDER BY asc", - "rawQuery": true, - "refId": "A", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "blocked" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], - "tags": [ - { - "key": "host", - "operator": "=~", - "value": "/^$server$/" - } - ] - } - ], - "maxDataPoints": null, - "timeFrom": null, - "timeShift": null -} diff --git a/salt/grafana/panels/ram_usage_guage.json.jinja b/salt/grafana/panels/ram_usage_guage.json.jinja deleted file mode 100644 index 813b9cba8..000000000 --- a/salt/grafana/panels/ram_usage_guage.json.jinja +++ /dev/null @@ -1,114 +0,0 @@ -{ - "id": 61860, - "gridPos": { - "x": {{ PANELS.ram_usage_guage.gridPos.x }}, - "y": {{ PANELS.ram_usage_guage.gridPos.y }}, - "w": {{ PANELS.ram_usage_guage.gridPos.w }}, - "h": {{ PANELS.ram_usage_guage.gridPos.h }} - }, - "type": "gauge", - "title": "RAM usage", - "datasource": "InfluxDB", - "pluginVersion": "8.2.1", - "links": [], - "fieldConfig": { - "defaults": { - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "rgba(50, 172, 45, 0.97)", - "value": null - }, - { - "color": "rgba(237, 129, 40, 0.89)", - "value": 70 - }, - { - "color": "rgba(245, 54, 54, 0.9)", - "value": 80 - } - ] - }, - "mappings": [ - { - "options": { - "match": "null", - "result": { - "text": "N/A" - } - }, - "type": "special" - } - ], - "color": { - "mode": "thresholds" - }, - "max": 100, - "min": 0, - "unit": "percent" - }, - "overrides": [] - }, - "interval": "30", - "options": { - "reduceOptions": { - "values": false, - "calcs": [ - "lastNotNull" - ], - "fields": "" - }, - "orientation": "horizontal", - "showThresholdLabels": false, - "showThresholdMarkers": true, - "text": {} - }, - "targets": [ - { - "dsType": "influxdb", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "measurement": "mem", - "policy": "default", - "refId": "A", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "used_percent" - ], - "type": "field" - }, - { - "params": [], - "type": "last" - } - ] - ], - "tags": [ - { - "key": "host", - "operator": "=", - "value": "$servername" - } - ], - "orderByTime": "ASC" - } - ], - "maxDataPoints": null, - "cacheTimeout": null -} diff --git a/salt/grafana/panels/redis_queue_graph.json.jinja b/salt/grafana/panels/redis_queue_graph.json.jinja deleted file mode 100644 index b33290008..000000000 --- a/salt/grafana/panels/redis_queue_graph.json.jinja +++ /dev/null @@ -1,208 +0,0 @@ -{ - "id": 55, - "gridPos": { - "x": {{ PANELS.redis_queue_graph.gridPos.x }}, - "y": {{ PANELS.redis_queue_graph.gridPos.y }}, - "w": {{ PANELS.redis_queue_graph.gridPos.w }}, - "h": {{ PANELS.redis_queue_graph.gridPos.h }} - }, - "type": "timeseries", - "title": "Redis Queue", - "datasource": "InfluxDB", - "pluginVersion": "8.2.1", - "interval": "30s", - "fieldConfig": { - "defaults": { - "custom": { - "drawStyle": "line", - "lineInterpolation": "linear", - "barAlignment": 0, - "lineWidth": 1, - "fillOpacity": 10, - "gradientMode": "none", - "spanNulls": false, - "showPoints": "never", - "pointSize": 5, - "stacking": { - "mode": "none", - "group": "A" - }, - "axisPlacement": "auto", - "axisLabel": "", - "scaleDistribution": { - "type": "linear" - }, - "hideFrom": { - "tooltip": false, - "viz": false, - "legend": false - }, - "thresholdsStyle": { - "mode": "off" - } - }, - "color": { - "mode": "palette-classic" - }, - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green", - "value": null - } - ] - }, - "mappings": [], - "links": [], - "unit": "short", - "decimals": 2 - }, - "overrides": [ - { - "matcher": { - "id": "byRegexp", - "options": "/Trend/" - }, - "properties": [ - { - "id": "custom.fillOpacity", - "value": 0 - }, - { - "id": "custom.lineWidth", - "value": 4 - }, - { - "id": "custom.lineStyle", - "value": { - "fill": "dash", - "dash": [ - 4, - 10 - ] - } - } - ] - } - ] - }, - "options": { - "tooltip": { - "mode": "single" - }, - "legend": { - "displayMode": "table", - "placement": "bottom", - "calcs": [ - "max", - "mean" - ] - } - }, - "targets": [ - { - "alias": "Queue Current", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "measurement": "redisqueue", - "orderByTime": "ASC", - "policy": "default", - "refId": "A", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "unparsed" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], - "tags": [ - { - "key": "role", - "operator": "=~", - "value": "/^manager/" - }, - { - "condition": "OR", - "key": "role", - "operator": "=", - "value": "standalone" - } - ] - }, - { - "alias": "Queue Trend", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "hide": false, - "measurement": "redisqueue", - "orderByTime": "ASC", - "policy": "so_long_term", - "refId": "B", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "mean_unparsed" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], - "tags": [ - { - "key": "role", - "operator": "=~", - "value": "/^manager/" - }, - { - "condition": "OR", - "key": "role", - "operator": "=", - "value": "standalone" - } - ] - } - ], - "maxDataPoints": null, - "description": "", - "timeFrom": null, - "timeShift": null -} diff --git a/salt/grafana/panels/redis_queue_stat.json.jinja b/salt/grafana/panels/redis_queue_stat.json.jinja deleted file mode 100644 index b0b3d8946..000000000 --- a/salt/grafana/panels/redis_queue_stat.json.jinja +++ /dev/null @@ -1,95 +0,0 @@ -{ - "datasource": "InfluxDB", - "fieldConfig": { - "defaults": { - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green", - "value": null - } - ] - }, - "mappings": [], - "color": { - "mode": "thresholds" - }, - "unit": "short" - }, - "overrides": [] - }, - "gridPos": { - "x": {{ PANELS.redis_queue_stat.gridPos.x }}, - "y": {{ PANELS.redis_queue_stat.gridPos.y }}, - "w": {{ PANELS.redis_queue_stat.gridPos.w }}, - "h": {{ PANELS.redis_queue_stat.gridPos.h }} - }, - "id": 68894, - "options": { - "reduceOptions": { - "values": false, - "calcs": [ - "lastNotNull" - ], - "fields": "" - }, - "orientation": "auto", - "text": {}, - "textMode": "auto", - "colorMode": "value", - "graphMode": "area", - "justifyMode": "auto" - }, - "pluginVersion": "7.5.4", - "targets": [ - { - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "measurement": "redisqueue", - "orderByTime": "ASC", - "policy": "default", - "queryType": "randomWalk", - "refId": "A", - "resultFormat": "time_series", - "select": [ - [ - { - "type": "field", - "params": [ - "unparsed" - ] - }, - { - "type": "last", - "params": [] - } - ] - ], - "tags": [ - { - "key": "host", - "operator": "=~", - "value": "/^$servername$/" - } - ] - } - ], - "title": "Redis Unparsed Queue", - "type": "stat", - "timeFrom": null, - "timeShift": null, - "interval": "30s" -} diff --git a/salt/grafana/panels/rootfs_used_guage.json.jinja b/salt/grafana/panels/rootfs_used_guage.json.jinja deleted file mode 100644 index b628d247c..000000000 --- a/salt/grafana/panels/rootfs_used_guage.json.jinja +++ /dev/null @@ -1,121 +0,0 @@ -{ - "id": 61866, - "gridPos": { - "x": {{ PANELS.rootfs_used_guage.gridPos.x }}, - "y": {{ PANELS.rootfs_used_guage.gridPos.y }}, - "w": {{ PANELS.rootfs_used_guage.gridPos.w }}, - "h": {{ PANELS.rootfs_used_guage.gridPos.h }} - }, - "type": "gauge", - "title": "RootFS used", - "datasource": "InfluxDB", - "pluginVersion": "8.2.1", - "links": [], - "fieldConfig": { - "defaults": { - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "rgba(50, 172, 45, 0.97)", - "value": null - }, - { - "color": "rgba(237, 129, 40, 0.89)", - "value": 70 - }, - { - "color": "rgba(245, 54, 54, 0.9)", - "value": 80 - } - ] - }, - "mappings": [ - { - "options": { - "match": "null", - "result": { - "text": "N/A" - } - }, - "type": "special" - } - ], - "color": { - "mode": "thresholds" - }, - "decimals": 0, - "max": 100, - "min": 0, - "unit": "percent" - }, - "overrides": [] - }, - "interval": "30", - "options": { - "reduceOptions": { - "values": false, - "calcs": [ - "lastNotNull" - ], - "fields": "" - }, - "orientation": "horizontal", - "showThresholdLabels": false, - "showThresholdMarkers": true, - "text": {} - }, - "targets": [ - { - "dsType": "influxdb", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "measurement": "disk", - "orderByTime": "ASC", - "policy": "default", - "refId": "A", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "used_percent" - ], - "type": "field" - }, - { - "params": [], - "type": "last" - } - ] - ], - "tags": [ - { - "key": "host", - "operator": "=", - "value": "$servername" - }, - { - "condition": "AND", - "key": "path", - "operator": "=", - "value": "/" - } - ] - } - ], - "maxDataPoints": null, - "cacheTimeout": null -} diff --git a/salt/grafana/panels/row_cpu.json.jinja b/salt/grafana/panels/row_cpu.json.jinja deleted file mode 100644 index 6384048d6..000000000 --- a/salt/grafana/panels/row_cpu.json.jinja +++ /dev/null @@ -1,15 +0,0 @@ -{ - "collapsed": false, - "datasource": null, - "gridPos": { - "x": {{ PANELS.row_cpu.gridPos.x }}, - "y": {{ PANELS.row_cpu.gridPos.y }}, - "w": {{ PANELS.row_cpu.gridPos.w }}, - "h": {{ PANELS.row_cpu.gridPos.h }} - }, - "id": 2, - "panels": [], - "repeat": null, - "title": "CPU", - "type": "row" - } diff --git a/salt/grafana/panels/row_disk_iops.json.jinja b/salt/grafana/panels/row_disk_iops.json.jinja deleted file mode 100644 index f54494825..000000000 --- a/salt/grafana/panels/row_disk_iops.json.jinja +++ /dev/null @@ -1,22 +0,0 @@ -{ - "collapsed": false, - "datasource": null, - "gridPos": { - "x": {{ PANELS.row_disk_iops.gridPos.x }}, - "y": {{ PANELS.row_disk_iops.gridPos.y }}, - "w": {{ PANELS.row_disk_iops.gridPos.w }}, - "h": {{ PANELS.row_disk_iops.gridPos.h }} - }, - "id": 62055, - "panels": [], - "repeat": "disk", - "scopedVars": { - "disk": { - "selected": false, - "text": "sda", - "value": "sda" - } - }, - "title": "Disk IOPS for /dev/$disk", - "type": "row" -} diff --git a/salt/grafana/panels/row_disk_usage.json.jinja b/salt/grafana/panels/row_disk_usage.json.jinja deleted file mode 100644 index 2cfac7cb4..000000000 --- a/salt/grafana/panels/row_disk_usage.json.jinja +++ /dev/null @@ -1,15 +0,0 @@ -{ - "collapsed": false, - "datasource": null, - "gridPos": { - "x": {{ PANELS.row_disk_usage.gridPos.x }}, - "y": {{ PANELS.row_disk_usage.gridPos.y }}, - "w": {{ PANELS.row_disk_usage.gridPos.w }}, - "h": {{ PANELS.row_disk_usage.gridPos.h }} - }, - "id": 3333, - "panels": [], - "repeat": null, - "title": "Disk Usage", - "type": "row" - } diff --git a/salt/grafana/panels/row_docker_details.json.jinja b/salt/grafana/panels/row_docker_details.json.jinja deleted file mode 100644 index bb06a57ed..000000000 --- a/salt/grafana/panels/row_docker_details.json.jinja +++ /dev/null @@ -1,15 +0,0 @@ -{ - "collapsed": false, - "datasource": null, - "gridPos": { - "x": {{ PANELS.row_docker_details.gridPos.x }}, - "y": {{ PANELS.row_docker_details.gridPos.y }}, - "w": {{ PANELS.row_docker_details.gridPos.w }}, - "h": {{ PANELS.row_docker_details.gridPos.h }} - }, - "id": 4, - "panels": [], - "repeat": null, - "title": "Docker Details", - "type": "row" - } diff --git a/salt/grafana/panels/row_elasticsearch.json.jinja b/salt/grafana/panels/row_elasticsearch.json.jinja deleted file mode 100644 index 04340c3e2..000000000 --- a/salt/grafana/panels/row_elasticsearch.json.jinja +++ /dev/null @@ -1,15 +0,0 @@ -{ - "collapsed": false, - "datasource": null, - "gridPos": { - "x": {{ PANELS.row_elasticsearch.gridPos.x }}, - "y": {{ PANELS.row_elasticsearch.gridPos.y }}, - "w": {{ PANELS.row_elasticsearch.gridPos.w }}, - "h": {{ PANELS.row_elasticsearch.gridPos.h }} - }, - "id": 2442, - "panels": [], - "repeat": null, - "title": "Elasticsearch", - "type": "row" - } diff --git a/salt/grafana/panels/row_influxdb.json.jinja b/salt/grafana/panels/row_influxdb.json.jinja deleted file mode 100644 index 7f3251cc9..000000000 --- a/salt/grafana/panels/row_influxdb.json.jinja +++ /dev/null @@ -1,15 +0,0 @@ -{ - "collapsed": false, - "datasource": null, - "gridPos": { - "x": {{ PANELS.row_influxdb.gridPos.x }}, - "y": {{ PANELS.row_influxdb.gridPos.y }}, - "w": {{ PANELS.row_influxdb.gridPos.w }}, - "h": {{ PANELS.row_influxdb.gridPos.h }} - }, - "id": 43434, - "panels": [], - "repeat": null, - "title": "InfluxDB", - "type": "row" - } diff --git a/salt/grafana/panels/row_logstash.json.jinja b/salt/grafana/panels/row_logstash.json.jinja deleted file mode 100644 index e934dbd0e..000000000 --- a/salt/grafana/panels/row_logstash.json.jinja +++ /dev/null @@ -1,15 +0,0 @@ -{ - "collapsed": false, - "datasource": null, - "gridPos": { - "x": {{ PANELS.row_logstash.gridPos.x }}, - "y": {{ PANELS.row_logstash.gridPos.y }}, - "w": {{ PANELS.row_logstash.gridPos.w }}, - "h": {{ PANELS.row_logstash.gridPos.h }} - }, - "id": 24242, - "panels": [], - "repeat": null, - "title": "Logstash", - "type": "row" - } diff --git a/salt/grafana/panels/row_memory.json.jinja b/salt/grafana/panels/row_memory.json.jinja deleted file mode 100644 index 33d203138..000000000 --- a/salt/grafana/panels/row_memory.json.jinja +++ /dev/null @@ -1,15 +0,0 @@ -{ - "collapsed": false, - "datasource": null, - "gridPos": { - "x": {{ PANELS.row_memory.gridPos.x }}, - "y": {{ PANELS.row_memory.gridPos.y }}, - "w": {{ PANELS.row_memory.gridPos.w }}, - "h": {{ PANELS.row_memory.gridPos.h }} - }, - "id": 3, - "panels": [], - "repeat": null, - "title": "Memory", - "type": "row" - } diff --git a/salt/grafana/panels/row_network.json.jinja b/salt/grafana/panels/row_network.json.jinja deleted file mode 100644 index 6f611f580..000000000 --- a/salt/grafana/panels/row_network.json.jinja +++ /dev/null @@ -1,15 +0,0 @@ -{ - "collapsed": false, - "datasource": null, - "gridPos": { - "x": {{ PANELS.row_network.gridPos.x }}, - "y": {{ PANELS.row_network.gridPos.y }}, - "w": {{ PANELS.row_network.gridPos.w }}, - "h": {{ PANELS.row_network.gridPos.h }} - }, - "id": 333, - "panels": [], - "repeat": null, - "title": "Network", - "type": "row" - } diff --git a/salt/grafana/panels/row_overview.json.jinja b/salt/grafana/panels/row_overview.json.jinja deleted file mode 100644 index d05a9394d..000000000 --- a/salt/grafana/panels/row_overview.json.jinja +++ /dev/null @@ -1,15 +0,0 @@ -{ - "collapsed": false, - "datasource": null, - "gridPos": { - "x": {{ PANELS.row_overview.gridPos.x }}, - "y": {{ PANELS.row_overview.gridPos.y }}, - "w": {{ PANELS.row_overview.gridPos.w }}, - "h": {{ PANELS.row_overview.gridPos.h }} - }, - "id": 1, - "panels": [], - "repeat": null, - "title": "Overview", - "type": "row" - } diff --git a/salt/grafana/panels/row_packet_loss.json.jinja b/salt/grafana/panels/row_packet_loss.json.jinja deleted file mode 100644 index b9d2c8a96..000000000 --- a/salt/grafana/panels/row_packet_loss.json.jinja +++ /dev/null @@ -1,15 +0,0 @@ -{ - "collapsed": false, - "datasource": null, - "gridPos": { - "x": {{ PANELS.row_packet_loss.gridPos.x }}, - "y": {{ PANELS.row_packet_loss.gridPos.y }}, - "w": {{ PANELS.row_packet_loss.gridPos.w }}, - "h": {{ PANELS.row_packet_loss.gridPos.h }} - }, - "id": 816341, - "panels": [], - "repeat": null, - "title": "Packet Loss", - "type": "row" - } diff --git a/salt/grafana/panels/row_redis.json.jinja b/salt/grafana/panels/row_redis.json.jinja deleted file mode 100644 index f0be53693..000000000 --- a/salt/grafana/panels/row_redis.json.jinja +++ /dev/null @@ -1,15 +0,0 @@ -{ - "collapsed": false, - "datasource": null, - "gridPos": { - "x": {{ PANELS.row_redis.gridPos.x }}, - "y": {{ PANELS.row_redis.gridPos.y }}, - "w": {{ PANELS.row_redis.gridPos.w }}, - "h": {{ PANELS.row_redis.gridPos.h }} - }, - "id": 24812, - "panels": [], - "repeat": null, - "title": "Redis", - "type": "row" - } diff --git a/salt/grafana/panels/row_stenographer.json.jinja b/salt/grafana/panels/row_stenographer.json.jinja deleted file mode 100644 index 004757748..000000000 --- a/salt/grafana/panels/row_stenographer.json.jinja +++ /dev/null @@ -1,15 +0,0 @@ -{ - "collapsed": false, - "datasource": null, - "gridPos": { - "x": {{ PANELS.row_stenographer.gridPos.x }}, - "y": {{ PANELS.row_stenographer.gridPos.y }}, - "w": {{ PANELS.row_stenographer.gridPos.w }}, - "h": {{ PANELS.row_stenographer.gridPos.h }} - }, - "id": 8812, - "panels": [], - "repeat": null, - "title": "Stenographer", - "type": "row" - } diff --git a/salt/grafana/panels/row_suricata.json.jinja b/salt/grafana/panels/row_suricata.json.jinja deleted file mode 100644 index d4dead5c5..000000000 --- a/salt/grafana/panels/row_suricata.json.jinja +++ /dev/null @@ -1,15 +0,0 @@ -{ - "collapsed": false, - "datasource": null, - "gridPos": { - "x": {{ PANELS.row_suricata.gridPos.x }}, - "y": {{ PANELS.row_suricata.gridPos.y }}, - "w": {{ PANELS.row_suricata.gridPos.w }}, - "h": {{ PANELS.row_suricata.gridPos.h }} - }, - "id": 8481, - "panels": [], - "repeat": null, - "title": "Suricata", - "type": "row" - } diff --git a/salt/grafana/panels/row_swap.json.jinja b/salt/grafana/panels/row_swap.json.jinja deleted file mode 100644 index c465dcc6e..000000000 --- a/salt/grafana/panels/row_swap.json.jinja +++ /dev/null @@ -1,15 +0,0 @@ -{ - "collapsed": false, - "datasource": null, - "gridPos": { - "x": {{ PANELS.row_swap.gridPos.x }}, - "y": {{ PANELS.row_swap.gridPos.y }}, - "w": {{ PANELS.row_swap.gridPos.w }}, - "h": {{ PANELS.row_swap.gridPos.h }} - }, - "id": 444, - "panels": [], - "repeat": null, - "title": "Swap", - "type": "row" - } diff --git a/salt/grafana/panels/row_zeek.json.jinja b/salt/grafana/panels/row_zeek.json.jinja deleted file mode 100644 index 1b236a543..000000000 --- a/salt/grafana/panels/row_zeek.json.jinja +++ /dev/null @@ -1,15 +0,0 @@ -{ - "collapsed": false, - "datasource": null, - "gridPos": { - "x": {{ PANELS.row_zeek.gridPos.x }}, - "y": {{ PANELS.row_zeek.gridPos.y }}, - "w": {{ PANELS.row_zeek.gridPos.w }}, - "h": {{ PANELS.row_zeek.gridPos.h }} - }, - "id": 21281, - "panels": [], - "repeat": null, - "title": "Zeek", - "type": "row" - } diff --git a/salt/grafana/panels/stenographer_packet_loss_graph.json.jinja b/salt/grafana/panels/stenographer_packet_loss_graph.json.jinja deleted file mode 100644 index 0fb56dbe7..000000000 --- a/salt/grafana/panels/stenographer_packet_loss_graph.json.jinja +++ /dev/null @@ -1,229 +0,0 @@ -{ - "id": 19, - "gridPos": { - "x": {{ PANELS.stenographer_packet_loss_graph.gridPos.x }}, - "y": {{ PANELS.stenographer_packet_loss_graph.gridPos.y }}, - "w": {{ PANELS.stenographer_packet_loss_graph.gridPos.w }}, - "h": {{ PANELS.stenographer_packet_loss_graph.gridPos.h }} - }, - "type": "timeseries", - "title": "Stenographer Packet Loss", - "datasource": "InfluxDB", - "pluginVersion": "8.2.1", - "interval": "30s", - "links": [], - "fieldConfig": { - "defaults": { - "custom": { - "drawStyle": "line", - "lineInterpolation": "linear", - "barAlignment": 0, - "lineWidth": 1, - "fillOpacity": 0, - "gradientMode": "none", - "spanNulls": false, - "showPoints": "never", - "pointSize": 5, - "stacking": { - "mode": "none", - "group": "A" - }, - "axisPlacement": "auto", - "axisLabel": "", - "scaleDistribution": { - "type": "linear" - }, - "hideFrom": { - "tooltip": false, - "viz": false, - "legend": false - }, - "thresholdsStyle": { - "mode": "off" - } - }, - "color": { - "mode": "palette-classic" - }, - "thresholds": { - "mode": "absolute", - "steps": [ - { - "value": null, - "color": "green" - }, - { - "value": 80, - "color": "red" - } - ] - }, - "mappings": [], - "links": [], - "unit": "percent", - "min": 0, - "decimals": 1 - }, - "overrides": [ - { - "matcher": { - "id": "byRegexp", - "options": "/Trend/" - }, - "properties": [ - { - "id": "custom.fillOpacity", - "value": 0 - }, - { - "id": "custom.lineWidth", - "value": 4 - }, - { - "id": "custom.lineStyle", - "value": { - "fill": "dash", - "dash": [ - 4, - 10 - ] - } - } - ] - } - ] - }, - "options": { - "tooltip": { - "mode": "single" - }, - "legend": { - "displayMode": "table", - "placement": "right", - "calcs": [ - "max", - "mean", - "lastNotNull" - ] - } - }, - "targets": [ - { - "alias": "Current $tag_host $tag_role", - "dsType": "influxdb", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "host" - ], - "type": "tag" - }, - { - "params": [ - "role" - ], - "type": "tag" - }, - { - "params": [ - "none" - ], - "type": "fill" - } - ], - "measurement": "stenodrop", - "orderByTime": "ASC", - "policy": "default", - "refId": "A", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "drop" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], - "tags": [ - { - "key": "host", - "operator": "=~", - "value": "/^$servername$/" - } - ] - }, - { - "alias": "Trend $tag_host $tag_role", - "dsType": "influxdb", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "host" - ], - "type": "tag" - }, - { - "params": [ - "role" - ], - "type": "tag" - }, - { - "params": [ - "none" - ], - "type": "fill" - } - ], - "hide": {{ PANELS.stenographer_packet_loss_graph.get('hideTrend', false)|json }}, - "measurement": "stenodrop", - "orderByTime": "ASC", - "policy": "so_long_term", - "refId": "B", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "mean_drop" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], - "tags": [ - { - "key": "host", - "operator": "=~", - "value": "/^$servername$/" - } - ] - } - ], - "maxDataPoints": null, - "cacheTimeout": null, - "timeFrom": null, - "timeShift": null -} diff --git a/salt/grafana/panels/stenographer_packet_loss_stat.json.jinja b/salt/grafana/panels/stenographer_packet_loss_stat.json.jinja deleted file mode 100644 index 863772fcd..000000000 --- a/salt/grafana/panels/stenographer_packet_loss_stat.json.jinja +++ /dev/null @@ -1,114 +0,0 @@ -{ - "datasource": "InfluxDB", - "fieldConfig": { - "defaults": { - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "dark-green", - "value": null - }, - { - "color": "rgba(237, 129, 40, 0.89)", - "value": 1 - }, - { - "color": "dark-red", - "value": 5 - } - ] - }, - "mappings": [ - { - "op": "=", - "text": "N/A", - "value": "null", - "$$hashKey": "object:1120", - "id": 0, - "type": 1 - } - ], - "unit": "percent", - "decimals": 2, - "color": { - "mode": "thresholds" - } - }, - "overrides": [] - }, - "gridPos": { - "x": {{ PANELS.stenographer_packet_loss_stat.gridPos.x }}, - "y": {{ PANELS.stenographer_packet_loss_stat.gridPos.y }}, - "w": {{ PANELS.stenographer_packet_loss_stat.gridPos.w }}, - "h": {{ PANELS.stenographer_packet_loss_stat.gridPos.h }} - }, - "id": 22, - "links": [], - "maxDataPoints": 100, - "targets": [ - { - "dsType": "influxdb", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "measurement": "stenodrop", - "orderByTime": "ASC", - "policy": "default", - "refId": "A", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "drop" - ], - "type": "field" - }, - { - "params": [], - "type": "last" - } - ] - ], - "tags": [ - { - "key": "host", - "operator": "=", - "value": "$servername" - } - ] - } - ], - "title": "Stenographer Packet Loss", - "type": "stat", - "options": { - "reduceOptions": { - "values": false, - "calcs": [ - "lastNotNull" - ], - "fields": "" - }, - "orientation": "horizontal", - "text": {}, - "textMode": "auto", - "colorMode": "value", - "graphMode": "area", - "justifyMode": "auto" - }, - "cacheTimeout": null, - "interval": null, - "pluginVersion": "7.5.4" -} diff --git a/salt/grafana/panels/stenographer_pcap_retention_graph.json.jinja b/salt/grafana/panels/stenographer_pcap_retention_graph.json.jinja deleted file mode 100644 index 83c51a73d..000000000 --- a/salt/grafana/panels/stenographer_pcap_retention_graph.json.jinja +++ /dev/null @@ -1,207 +0,0 @@ -{ - "id": 2239, - "gridPos": { - "x": {{ PANELS.stenographer_pcap_retention_graph.gridPos.x }}, - "y": {{ PANELS.stenographer_pcap_retention_graph.gridPos.y }}, - "w": {{ PANELS.stenographer_pcap_retention_graph.gridPos.w }}, - "h": {{ PANELS.stenographer_pcap_retention_graph.gridPos.h }} - }, - "type": "timeseries", - "title": "Stenographer PCAP Retention", - "datasource": "InfluxDB", - "pluginVersion": "8.2.1", - "maxDataPoints": 750, - "interval": "30s", - "links": [], - "fieldConfig": { - "defaults": { - "custom": { - "drawStyle": "line", - "lineInterpolation": "linear", - "barAlignment": 0, - "lineWidth": 1, - "fillOpacity": 10, - "gradientMode": "none", - "spanNulls": true, - "showPoints": "never", - "pointSize": 5, - "stacking": { - "mode": "none", - "group": "A" - }, - "axisPlacement": "auto", - "axisLabel": "", - "scaleDistribution": { - "type": "linear" - }, - "hideFrom": { - "tooltip": false, - "viz": false, - "legend": false - }, - "thresholdsStyle": { - "mode": "off" - } - }, - "color": { - "mode": "palette-classic" - }, - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green", - "value": null - } - ] - }, - "mappings": [], - "unit": "s", - "decimals": 2 - }, - "overrides": [ - { - "matcher": { - "id": "byRegexp", - "options": "/Trend/" - }, - "properties": [ - { - "id": "custom.fillOpacity", - "value": 0 - }, - { - "id": "custom.lineWidth", - "value": 4 - }, - { - "id": "custom.lineStyle", - "value": { - "fill": "dash", - "dash": [ - 4, - 10 - ] - } - } - ] - } - ] - }, - "options": { - "tooltip": { - "mode": "single" - }, - "legend": { - "displayMode": "hidden", - "placement": "bottom", - "calcs": [] - } - }, - "targets": [ - { - "alias": "$tag_host: Oldest Pcap Current", - "dsType": "influxdb", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "type": "tag", - "params": [ - "host" - ] - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "measurement": "pcapage", - "orderByTime": "ASC", - "policy": "default", - "refId": "A", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "seconds" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], - "tags": [ - { - "key": "host", - "operator": "=~", - "value": "/^$servername$/" - } - ] - }, - { - "alias": "$tag_host: Oldest Pcap Trend", - "dsType": "influxdb", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "type": "tag", - "params": [ - "host" - ] - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "hide": false, - "measurement": "pcapage", - "orderByTime": "ASC", - "policy": "so_long_term", - "refId": "B", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "mean_seconds" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], - "tags": [ - { - "key": "host", - "operator": "=~", - "value": "/^$servername$/" - } - ] - } - ], - "cacheTimeout": null, - "timeFrom": null, - "timeShift": null -} diff --git a/salt/grafana/panels/suricata_packet_loss_graph.json.jinja b/salt/grafana/panels/suricata_packet_loss_graph.json.jinja deleted file mode 100644 index eb26f9d8b..000000000 --- a/salt/grafana/panels/suricata_packet_loss_graph.json.jinja +++ /dev/null @@ -1,241 +0,0 @@ -{ - "id": 21, - "gridPos": { - "x": {{ PANELS.suricata_packet_loss_graph.gridPos.x }}, - "y": {{ PANELS.suricata_packet_loss_graph.gridPos.y }}, - "w": {{ PANELS.suricata_packet_loss_graph.gridPos.w }}, - "h": {{ PANELS.suricata_packet_loss_graph.gridPos.h }} - }, - "type": "timeseries", - "title": "Suricata Packet Loss", - "datasource": "InfluxDB", - "pluginVersion": "8.2.1", - "interval": "30s", - "links": [], - "fieldConfig": { - "defaults": { - "custom": { - "drawStyle": "line", - "lineInterpolation": "linear", - "barAlignment": 0, - "lineWidth": 1, - "fillOpacity": 0, - "gradientMode": "none", - "spanNulls": false, - "showPoints": "never", - "pointSize": 5, - "stacking": { - "mode": "none", - "group": "A" - }, - "axisPlacement": "auto", - "axisLabel": "", - "scaleDistribution": { - "type": "linear" - }, - "hideFrom": { - "tooltip": false, - "viz": false, - "legend": false - }, - "thresholdsStyle": { - "mode": "off" - } - }, - "color": { - "mode": "palette-classic" - }, - "thresholds": { - "mode": "absolute", - "steps": [ - { - "value": null, - "color": "green" - }, - { - "value": 80, - "color": "red" - } - ] - }, - "mappings": [], - "links": [], - "unit": "percent", - "min": 0, - "decimals": 1 - }, - "overrides": [ - { - "matcher": { - "id": "byRegexp", - "options": "/Trend/" - }, - "properties": [ - { - "id": "custom.fillOpacity", - "value": 0 - }, - { - "id": "custom.lineWidth", - "value": 4 - }, - { - "id": "custom.lineStyle", - "value": { - "fill": "dash", - "dash": [ - 4, - 10 - ] - } - } - ] - } - ] - }, - "options": { - "tooltip": { - "mode": "single" - }, - "legend": { - "displayMode": "table", - "placement": "right", - "calcs": [ - "max", - "mean", - "lastNotNull" - ] - } - }, - "targets": [ - { - "alias": "Current $tag_host $tag_role", - "dsType": "influxdb", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "host" - ], - "type": "tag" - }, - { - "params": [ - "role" - ], - "type": "tag" - }, - { - "params": [ - "none" - ], - "type": "fill" - } - ], - "measurement": "suridrop", - "orderByTime": "ASC", - "policy": "default", - "refId": "A", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "drop" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - }, - { - "params": [ - "* 100" - ], - "type": "math" - } - ] - ], - "tags": [ - { - "key": "host", - "operator": "=~", - "value": "/^$servername$/" - } - ] - }, - { - "alias": "Trend $tag_host $tag_role", - "dsType": "influxdb", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "host" - ], - "type": "tag" - }, - { - "params": [ - "role" - ], - "type": "tag" - }, - { - "params": [ - "none" - ], - "type": "fill" - } - ], - "hide": {{ PANELS.suricata_packet_loss_graph.get('hideTrend', false)|json }}, - "measurement": "suridrop", - "orderByTime": "ASC", - "policy": "so_long_term", - "refId": "B", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "mean_drop" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - }, - { - "params": [ - "* 100" - ], - "type": "math" - } - ] - ], - "tags": [ - { - "key": "host", - "operator": "=~", - "value": "/^$servername$/" - } - ] - } - ], - "maxDataPoints": null, - "cacheTimeout": null, - "timeFrom": null, - "timeShift": null -} diff --git a/salt/grafana/panels/suricata_packet_loss_stat.json.jinja b/salt/grafana/panels/suricata_packet_loss_stat.json.jinja deleted file mode 100644 index 87a3f48e5..000000000 --- a/salt/grafana/panels/suricata_packet_loss_stat.json.jinja +++ /dev/null @@ -1,120 +0,0 @@ -{ - "datasource": "InfluxDB", - "fieldConfig": { - "defaults": { - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "dark-green", - "value": null - }, - { - "color": "rgba(237, 129, 40, 0.89)", - "value": 1 - }, - { - "color": "dark-red", - "value": 5 - } - ] - }, - "mappings": [ - { - "op": "=", - "text": "N/A", - "value": "null", - "$$hashKey": "object:949", - "id": 0, - "type": 1 - } - ], - "unit": "percent", - "decimals": 2, - "color": { - "mode": "thresholds" - } - }, - "overrides": [] - }, - "gridPos": { - "x": {{ PANELS.suricata_packet_loss_stat.gridPos.x }}, - "y": {{ PANELS.suricata_packet_loss_stat.gridPos.y }}, - "w": {{ PANELS.suricata_packet_loss_stat.gridPos.w }}, - "h": {{ PANELS.suricata_packet_loss_stat.gridPos.h }} - }, - "id": 20, - "links": [], - "maxDataPoints": 100, - "targets": [ - { - "dsType": "influxdb", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "measurement": "suridrop", - "orderByTime": "ASC", - "policy": "default", - "refId": "A", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "drop" - ], - "type": "field" - }, - { - "params": [], - "type": "last" - }, - { - "params": [ - "* 100" - ], - "type": "math" - } - ] - ], - "tags": [ - { - "key": "host", - "operator": "=", - "value": "$servername" - } - ] - } - ], - "title": "Suricata Packet Loss", - "type": "stat", - "options": { - "reduceOptions": { - "values": false, - "calcs": [ - "lastNotNull" - ], - "fields": "" - }, - "orientation": "horizontal", - "text": {}, - "textMode": "auto", - "colorMode": "value", - "graphMode": "area", - "justifyMode": "auto" - }, - "pluginVersion": "7.5.4", - "cacheTimeout": null, - "interval": null -} diff --git a/salt/grafana/panels/swap_io_bytes_graph.json.jinja b/salt/grafana/panels/swap_io_bytes_graph.json.jinja deleted file mode 100644 index fe7989870..000000000 --- a/salt/grafana/panels/swap_io_bytes_graph.json.jinja +++ /dev/null @@ -1,187 +0,0 @@ -{ - "id": 68890, - "gridPos": { - "x": {{ PANELS.swap_io_bytes_graph.gridPos.x }}, - "y": {{ PANELS.swap_io_bytes_graph.gridPos.y }}, - "w": {{ PANELS.swap_io_bytes_graph.gridPos.w }}, - "h": {{ PANELS.swap_io_bytes_graph.gridPos.h }} - }, - "type": "timeseries", - "title": "Swap I/O Bytes", - "datasource": "InfluxDB", - "pluginVersion": "8.2.1", - "interval": "30s", - "options": { - "tooltip": { - "mode": "single" - }, - "legend": { - "displayMode": "table", - "placement": "bottom", - "calcs": [ - "max", - "mean", - "lastNotNull" - ] - } - }, - "targets": [ - { - "alias": "$tag_host: $col", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "orderByTime": "ASC", - "policy": "default", - "query": "SELECT non_negative_derivative(mean(\"in\")) as \"in\", non_negative_derivative(mean(\"out\")) as \"out\" FROM \"swap\" WHERE host =~ /$servername$/ AND $timeFilter GROUP BY time($__interval), host ORDER BY asc", - "queryType": "randomWalk", - "rawQuery": true, - "refId": "A", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "value" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], - "tags": [] - }, - { - "alias": "$tag_host: $col", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "hide": false, - "orderByTime": "ASC", - "policy": "default", - "query": "SELECT non_negative_derivative(mean(\"mean_in\")) as \"trend_in\", non_negative_derivative(mean(\"mean_out\")) as \"trend_out\" FROM \"so_long_term\".\"swap\" WHERE host =~ /$servername$/ AND $timeFilter GROUP BY time($__interval), host fill(linear) ORDER BY asc", - "queryType": "randomWalk", - "rawQuery": true, - "refId": "B", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "value" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], - "tags": [] - } - ], - "fieldConfig": { - "defaults": { - "custom": { - "drawStyle": "line", - "lineInterpolation": "linear", - "barAlignment": 0, - "lineWidth": 1, - "fillOpacity": 10, - "gradientMode": "none", - "spanNulls": false, - "showPoints": "never", - "pointSize": 5, - "stacking": { - "mode": "none", - "group": "A" - }, - "axisPlacement": "auto", - "axisLabel": "", - "scaleDistribution": { - "type": "linear" - }, - "hideFrom": { - "tooltip": false, - "viz": false, - "legend": false - }, - "thresholdsStyle": { - "mode": "off" - } - }, - "color": { - "mode": "palette-classic" - }, - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green", - "value": null - } - ] - }, - "mappings": [], - "unit": "bytes", - "decimals": 1 - }, - "overrides": [ - { - "matcher": { - "id": "byRegexp", - "options": "/trend/" - }, - "properties": [ - { - "id": "custom.fillOpacity", - "value": 0 - }, - { - "id": "custom.lineWidth", - "value": 4 - }, - { - "id": "custom.lineStyle", - "value": { - "fill": "dash", - "dash": [ - 4, - 10 - ] - } - } - ] - } - ] - }, - "maxDataPoints": null, - "timeFrom": null, - "timeShift": null -} diff --git a/salt/grafana/panels/swap_usage_bytes_graph.json.jinja b/salt/grafana/panels/swap_usage_bytes_graph.json.jinja deleted file mode 100644 index 4986b72a5..000000000 --- a/salt/grafana/panels/swap_usage_bytes_graph.json.jinja +++ /dev/null @@ -1,184 +0,0 @@ -{ - "type": "graph", - "title": "Swap Usage", - "gridPos": { - "x": {{ PANELS.swap_usage_bytes_graph.gridPos.x }}, - "y": {{ PANELS.swap_usage_bytes_graph.gridPos.y }}, - "w": {{ PANELS.swap_usage_bytes_graph.gridPos.w }}, - "h": {{ PANELS.swap_usage_bytes_graph.gridPos.h }} - }, - "id": 68892, - "targets": [ - { - "refId": "A", - "queryType": "randomWalk", - "policy": "default", - "resultFormat": "time_series", - "orderByTime": "ASC", - "tags": [], - "groupBy": [ - { - "type": "time", - "params": [ - "$__interval" - ] - }, - { - "type": "fill", - "params": [ - "null" - ] - } - ], - "select": [ - [ - { - "type": "field", - "params": [ - "value" - ] - }, - { - "type": "mean", - "params": [] - } - ] - ], - "query": "SELECT mean(used) as \"used\", mean(total) as \"total\" FROM \"swap\" WHERE host =~ /$servername$/ AND $timeFilter GROUP BY time($__interval), host ORDER BY asc", - "rawQuery": true, - "alias": "$tag_host: $col" - }, - { - "refId": "B", - "queryType": "randomWalk", - "policy": "default", - "resultFormat": "time_series", - "orderByTime": "ASC", - "tags": [], - "groupBy": [ - { - "type": "time", - "params": [ - "$__interval" - ] - }, - { - "type": "fill", - "params": [ - "null" - ] - } - ], - "select": [ - [ - { - "type": "field", - "params": [ - "value" - ] - }, - { - "type": "mean", - "params": [] - } - ] - ], - "query": "SELECT mean(mean_used) as \"trend_used\", mean(mean_total) as \"trend_total\" FROM \"so_long_term\".\"swap\" WHERE host =~ /$servername$/ AND $timeFilter GROUP BY time($__interval), host ORDER BY asc", - "rawQuery": true, - "alias": "$tag_host: $col", - "hide": false - } - ], - "options": { - "alertThreshold": true - }, - "datasource": "InfluxDB", - "fieldConfig": { - "defaults": {}, - "overrides": [] - }, - "pluginVersion": "7.5.4", - "renderer": "flot", - "yaxes": [ - { - "label": null, - "show": true, - "logBase": 1, - "min": "0", - "max": null, - "format": "bytes", - "$$hashKey": "object:515" - }, - { - "label": null, - "show": true, - "logBase": 1, - "min": null, - "max": null, - "format": "short", - "$$hashKey": "object:516" - } - ], - "xaxis": { - "show": true, - "mode": "time", - "name": null, - "values": [], - "buckets": null - }, - "yaxis": { - "align": false, - "alignLevel": null - }, - "lines": true, - "fill": 1, - "linewidth": 1, - "dashLength": 10, - "spaceLength": 10, - "pointradius": 2, - "legend": { - "show": true, - "values": true, - "min": false, - "max": true, - "current": true, - "total": false, - "avg": true, - "alignAsTable": true - }, - "nullPointMode": "connected", - "tooltip": { - "value_type": "individual", - "shared": true, - "sort": 0 - }, - "aliasColors": {}, - "seriesOverrides": [ - { - "$$hashKey": "object:575", - "alias": "/total/", - "fill": 0, - "color": "#C4162A" - }, - { - "$$hashKey": "object:596", - "alias": "/trend/", - "fill": 0, - "linewidth": 4, - "dashes": true, - "dashLength": 4 - } - ], - "thresholds": [], - "timeRegions": [], - "fillGradient": 0, - "dashes": false, - "hiddenSeries": false, - "points": false, - "bars": false, - "stack": false, - "percentage": false, - "steppedLine": false, - "maxDataPoints": 750, - "interval": "30s" -} diff --git a/salt/grafana/panels/swap_usage_guage.json.jinja b/salt/grafana/panels/swap_usage_guage.json.jinja deleted file mode 100644 index f7e3d4f34..000000000 --- a/salt/grafana/panels/swap_usage_guage.json.jinja +++ /dev/null @@ -1,115 +0,0 @@ -{ - "id": 61863, - "gridPos": { - "x": {{ PANELS.swap_usage_guage.gridPos.x }}, - "y": {{ PANELS.swap_usage_guage.gridPos.y }}, - "w": {{ PANELS.swap_usage_guage.gridPos.w }}, - "h": {{ PANELS.swap_usage_guage.gridPos.h }} - }, - "type": "gauge", - "title": "Swap usage", - "datasource": "InfluxDB", - "pluginVersion": "8.2.1", - "links": [], - "fieldConfig": { - "defaults": { - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "rgba(50, 172, 45, 0.97)", - "value": null - }, - { - "color": "rgba(237, 129, 40, 0.89)", - "value": 50 - }, - { - "color": "rgba(245, 54, 54, 0.9)", - "value": 70 - } - ] - }, - "mappings": [ - { - "options": { - "match": "null", - "result": { - "text": "N/A" - } - }, - "type": "special" - } - ], - "color": { - "mode": "thresholds" - }, - "decimals": 0, - "max": 100, - "min": 0, - "unit": "percent" - }, - "overrides": [] - }, - "interval": "30", - "options": { - "reduceOptions": { - "values": false, - "calcs": [ - "lastNotNull" - ], - "fields": "" - }, - "orientation": "horizontal", - "showThresholdLabels": false, - "showThresholdMarkers": true, - "text": {} - }, - "targets": [ - { - "dsType": "influxdb", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "measurement": "swap", - "policy": "default", - "refId": "A", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "used_percent" - ], - "type": "field" - }, - { - "params": [], - "type": "last" - } - ] - ], - "tags": [ - { - "key": "host", - "operator": "=", - "value": "$servername" - } - ], - "orderByTime": "ASC" - } - ], - "maxDataPoints": null, - "cacheTimeout": null -} diff --git a/salt/grafana/panels/swap_usage_percent_graph.json.jinja b/salt/grafana/panels/swap_usage_percent_graph.json.jinja deleted file mode 100644 index 875107fd7..000000000 --- a/salt/grafana/panels/swap_usage_percent_graph.json.jinja +++ /dev/null @@ -1,141 +0,0 @@ -{ - "id": 69873, - "gridPos": { - "x": {{ PANELS.swap_usage_percent_graph.gridPos.x }}, - "y": {{ PANELS.swap_usage_percent_graph.gridPos.y }}, - "w": {{ PANELS.swap_usage_percent_graph.gridPos.w }}, - "h": {{ PANELS.swap_usage_percent_graph.gridPos.h }} - }, - "type": "timeseries", - "title": "Swap Usage", - "datasource": "InfluxDB", - "pluginVersion": "8.2.1", - "fieldConfig": { - "defaults": { - "custom": { - "drawStyle": "line", - "lineInterpolation": "linear", - "barAlignment": 0, - "lineWidth": 1, - "fillOpacity": 0, - "gradientMode": "none", - "spanNulls": false, - "showPoints": "never", - "pointSize": 5, - "stacking": { - "mode": "none", - "group": "A" - }, - "axisPlacement": "auto", - "axisLabel": "", - "scaleDistribution": { - "type": "linear" - }, - "hideFrom": { - "tooltip": false, - "viz": false, - "legend": false - }, - "thresholdsStyle": { - "mode": "off" - } - }, - "color": { - "mode": "palette-classic" - }, - "thresholds": { - "mode": "absolute", - "steps": [ - { - "value": null, - "color": "green" - }, - { - "value": 80, - "color": "red" - } - ] - }, - "mappings": [], - "unit": "percent", - "decimals": 1 - }, - "overrides": [] - }, - "options": { - "tooltip": { - "mode": "single" - }, - "legend": { - "displayMode": "table", - "placement": "right", - "calcs": [ - "max", - "mean", - "lastNotNull" - ] - } - }, - "targets": [ - { - "alias": "$tag_host $tag_role", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "host" - ], - "type": "tag" - }, - { - "params": [ - "role" - ], - "type": "tag" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "measurement": "swap", - "orderByTime": "ASC", - "policy": "default", - "queryType": "randomWalk", - "refId": "A", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "used_percent" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], - "tags": [ - { - "key": "host", - "operator": "=~", - "value": "/^$servername$/" - } - ] - } - ], - "timeFrom": null, - "timeShift": null, - "interval": "30s", - "maxDataPoints": null -} diff --git a/salt/grafana/panels/system_uptime.json.jinja b/salt/grafana/panels/system_uptime.json.jinja deleted file mode 100644 index fc2cb69ac..000000000 --- a/salt/grafana/panels/system_uptime.json.jinja +++ /dev/null @@ -1,91 +0,0 @@ -{ - "datasource": "InfluxDB", - "fieldConfig": { - "defaults": { - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "rgb(255, 255, 255)", - "value": null - } - ] - }, - "mappings": [], - "decimals": 2, - "unit": "s" - }, - "overrides": [] - }, - "gridPos": { - "x": {{ PANELS.system_uptime.gridPos.x }}, - "y": {{ PANELS.system_uptime.gridPos.y }}, - "w": {{ PANELS.system_uptime.gridPos.w }}, - "h": {{ PANELS.system_uptime.gridPos.h }} - }, - "id": 39, - "options": { - "reduceOptions": { - "values": false, - "calcs": [ - "lastNotNull" - ], - "fields": "" - }, - "orientation": "auto", - "text": {}, - "textMode": "auto", - "colorMode": "value", - "graphMode": "none", - "justifyMode": "auto" - }, - "pluginVersion": "7.5.4", - "targets": [ - { - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "measurement": "system", - "orderByTime": "ASC", - "policy": "default", - "refId": "A", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "uptime" - ], - "type": "field" - }, - { - "params": [], - "type": "last" - } - ] - ], - "tags": [ - { - "key": "host", - "operator": "=", - "value": "$servername" - } - ] - } - ], - "timeFrom": null, - "timeShift": null, - "title": "System Uptime", - "type": "stat" -} diff --git a/salt/grafana/panels/system_uptime_graph.json.jinja b/salt/grafana/panels/system_uptime_graph.json.jinja deleted file mode 100644 index bf26b520f..000000000 --- a/salt/grafana/panels/system_uptime_graph.json.jinja +++ /dev/null @@ -1,148 +0,0 @@ -{ - "type": "graph", - "title": "System Uptime", - "gridPos": { - "x": {{ PANELS.system_uptime_graph.gridPos.x }}, - "y": {{ PANELS.system_uptime_graph.gridPos.y }}, - "w": {{ PANELS.system_uptime_graph.gridPos.w }}, - "h": {{ PANELS.system_uptime_graph.gridPos.h }} - }, - "id": 69016, - "targets": [ - { - "refId": "A", - "queryType": "randomWalk", - "policy": "default", - "resultFormat": "time_series", - "orderByTime": "ASC", - "tags": [ - { - "key": "host", - "operator": "=~", - "value": "/^$servername$/" - } - ], - "groupBy": [ - { - "type": "time", - "params": [ - "$__interval" - ] - }, - { - "type": "tag", - "params": [ - "host" - ] - }, - { - "type": "tag", - "params": [ - "role" - ] - }, - { - "type": "fill", - "params": [ - "null" - ] - } - ], - "select": [ - [ - { - "type": "field", - "params": [ - "uptime" - ] - }, - { - "type": "last", - "params": [] - } - ] - ], - "measurement": "system", - "alias": "$tag_host $tag_role" - } - ], - "options": { - "alertThreshold": true - }, - "datasource": "InfluxDB", - "fieldConfig": { - "defaults": {}, - "overrides": [] - }, - "pluginVersion": "7.5.4", - "renderer": "flot", - "yaxes": [ - { - "label": "", - "show": true, - "logBase": 1, - "min": "0", - "max": "604800", - "format": "s", - "$$hashKey": "object:213", - "decimals": 1 - }, - { - "label": null, - "show": true, - "logBase": 1, - "min": null, - "max": null, - "format": "short", - "$$hashKey": "object:214" - } - ], - "xaxis": { - "show": true, - "mode": "time", - "name": null, - "values": [], - "buckets": null - }, - "yaxis": { - "align": false, - "alignLevel": null - }, - "lines": true, - "linewidth": 1, - "dashLength": 10, - "spaceLength": 10, - "pointradius": 2, - "legend": { - "show": true, - "values": true, - "min": false, - "max": false, - "current": true, - "total": false, - "avg": false, - "alignAsTable": true, - "rightSide": true - }, - "nullPointMode": "connected", - "tooltip": { - "value_type": "individual", - "shared": true, - "sort": 1 - }, - "aliasColors": {}, - "seriesOverrides": [], - "thresholds": [], - "timeRegions": [], - "fill": 0, - "fillGradient": 0, - "dashes": false, - "hiddenSeries": false, - "points": false, - "bars": false, - "stack": false, - "percentage": false, - "steppedLine": false, - "decimals": 1, - "description": "" -} diff --git a/salt/grafana/panels/uptime_docker_combined_current_graph.json.jinja b/salt/grafana/panels/uptime_docker_combined_current_graph.json.jinja deleted file mode 100644 index ad4ff2805..000000000 --- a/salt/grafana/panels/uptime_docker_combined_current_graph.json.jinja +++ /dev/null @@ -1,168 +0,0 @@ -{ - "aliasColors": {}, - "dashLength": 10, - "datasource": "InfluxDB", - "decimals": 1, - "fieldConfig": { - "defaults": {}, - "overrides": [] - }, - "gridPos": { - "x": {{ PANELS.uptime_docker_combined_current_graph.gridPos.x }}, - "y": {{ PANELS.uptime_docker_combined_current_graph.gridPos.y }}, - "w": {{ PANELS.uptime_docker_combined_current_graph.gridPos.w }}, - "h": {{ PANELS.uptime_docker_combined_current_graph.gridPos.h }} - }, - "id": 68896, - "legend": { - "alignAsTable": true, - "avg": false, - "current": true, - "max": false, - "min": false, - "rightSide": true, - "show": true, - "sort": "current", - "sortDesc": false, - "total": false, - "values": true - }, - "lines": true, - "linewidth": 1, - "nullPointMode": "connected", - "options": { - "alertThreshold": true - }, - "pluginVersion": "7.5.4", - "pointradius": 2, - "renderer": "flot", - "seriesOverrides": [], - "spaceLength": 10, - "targets": [ - { - "alias": "$tag_host $tag_role $tag_container_name", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "container_name" - ], - "type": "tag" - }, - { - "type": "tag", - "params": [ - "host" - ] - }, - { - "type": "tag", - "params": [ - "role" - ] - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "measurement": "docker_container_status", - "orderByTime": "ASC", - "policy": "default", - "query": "SELECT last(\"uptime_ns\") FROM \"docker_container_status\" WHERE (\"host\" =~ /^$servername$/ AND \"container_name\" =~ /^$containers$/) AND $timeFilter GROUP BY time($__interval), \"container_name\", \"host\", \"role\" fill(null)", - "queryType": "randomWalk", - "rawQuery": false, - "refId": "A", - "resultFormat": "time_series", - "select": [ - [ - { - "type": "field", - "params": [ - "uptime_ns" - ] - }, - { - "type": "last", - "params": [] - } - ] - ], - "tags": [ - { - "key": "host", - "operator": "=~", - "value": "/^$servername$/" - }, - { - "condition": "AND", - "key": "container_name", - "operator": "=~", - "value": "/^$containers$/" - } - ], - "slimit": "", - "limit": "" - } - ], - "thresholds": [], - "timeRegions": [], - "title": "Container Uptime Current", - "tooltip": { - "shared": true, - "sort": 1, - "value_type": "individual" - }, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "$$hashKey": "object:192", - "format": "ns", - "label": null, - "logBase": 1, - "max": "604800000000000", - "min": "0", - "show": true, - "decimals": 1 - }, - { - "$$hashKey": "object:193", - "decimals": 2, - "format": "short", - "label": "", - "logBase": 1, - "max": null, - "min": "0", - "show": false - } - ], - "yaxis": { - "align": false, - "alignLevel": null - }, - "bars": false, - "dashes": false, - "fill": 0, - "fillGradient": 0, - "hiddenSeries": false, - "percentage": false, - "points": false, - "stack": false, - "steppedLine": false, - "timeFrom": null, - "timeShift": null -} diff --git a/salt/grafana/panels/uptime_docker_combined_trend_graph.json.jinja b/salt/grafana/panels/uptime_docker_combined_trend_graph.json.jinja deleted file mode 100644 index a4be68137..000000000 --- a/salt/grafana/panels/uptime_docker_combined_trend_graph.json.jinja +++ /dev/null @@ -1,165 +0,0 @@ -{ - "id": 68999, - "gridPos": { - "x": {{ PANELS.uptime_docker_combined_trend_graph.gridPos.x }}, - "y": {{ PANELS.uptime_docker_combined_trend_graph.gridPos.y }}, - "w": {{ PANELS.uptime_docker_combined_trend_graph.gridPos.w }}, - "h": {{ PANELS.uptime_docker_combined_trend_graph.gridPos.h }} - }, - "type": "graph", - "title": "Container Uptime Trend", - "datasource": "InfluxDB", - "thresholds": [ - { - "$$hashKey": "object:1299", - "colorMode": "critical", - "fill": false, - "line": true, - "op": "lt", - "value": 4500000000000, - "yaxis": "left" - } - ], - "pluginVersion": "8.2.1", - "legend": { - "alignAsTable": true, - "avg": false, - "current": true, - "max": false, - "min": false, - "rightSide": true, - "show": true, - "sort": "current", - "sortDesc": false, - "total": false, - "values": true - }, - "aliasColors": {}, - "dashLength": 10, - "decimals": 1, - "lines": true, - "linewidth": 1, - "nullPointMode": "connected", - "options": { - "alertThreshold": true - }, - "pointradius": 2, - "renderer": "flot", - "seriesOverrides": [], - "spaceLength": 10, - "targets": [ - { - "alias": "$tag_host: $tag_container_name", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "container_name" - ], - "type": "tag" - }, - { - "type": "tag", - "params": [ - "host" - ] - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "measurement": "docker_container_status", - "orderByTime": "ASC", - "policy": "so_long_term", - "queryType": "randomWalk", - "refId": "A", - "resultFormat": "time_series", - "select": [ - [ - { - "type": "field", - "params": [ - "mean_uptime_ns" - ] - }, - { - "type": "last", - "params": [] - } - ] - ], - "tags": [ - { - "key": "host", - "operator": "=~", - "value": "/^$servername$/" - }, - { - "condition": "AND", - "key": "container_name", - "operator": "=~", - "value": "/^$containers$/" - } - ] - } - ], - "timeRegions": [], - "tooltip": { - "shared": true, - "sort": 1, - "value_type": "individual" - }, - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "$$hashKey": "object:192", - "format": "ns", - "label": null, - "logBase": 1, - "max": "604800000000000", - "min": null, - "show": true, - "decimals": 1 - }, - { - "$$hashKey": "object:193", - "decimals": 2, - "format": "short", - "label": "", - "logBase": 1, - "max": null, - "min": "0", - "show": false - } - ], - "yaxis": { - "align": false, - "alignLevel": null - }, - "interval": "30s", - "bars": false, - "dashes": false, - "fill": 0, - "fillGradient": 0, - "hiddenSeries": false, - "percentage": false, - "points": false, - "stack": false, - "steppedLine": false, - "timeFrom": null, - "timeShift": null -} diff --git a/salt/grafana/panels/zeek_capture_loss_graph.json.jinja b/salt/grafana/panels/zeek_capture_loss_graph.json.jinja deleted file mode 100644 index 53adcd7fa..000000000 --- a/salt/grafana/panels/zeek_capture_loss_graph.json.jinja +++ /dev/null @@ -1,203 +0,0 @@ -{ - "id": 71, - "gridPos": { - "x": {{ PANELS.zeek_capture_loss_graph.gridPos.x }}, - "y": {{ PANELS.zeek_capture_loss_graph.gridPos.y }}, - "w": {{ PANELS.zeek_capture_loss_graph.gridPos.w }}, - "h": {{ PANELS.zeek_capture_loss_graph.gridPos.h }} - }, - "type": "timeseries", - "title": "Capture Loss", - "datasource": "InfluxDB", - "pluginVersion": "8.2.1", - "interval": "30s", - "fieldConfig": { - "defaults": { - "custom": { - "drawStyle": "line", - "lineInterpolation": "linear", - "barAlignment": 0, - "lineWidth": 1, - "fillOpacity": 10, - "gradientMode": "none", - "spanNulls": true, - "showPoints": "auto", - "pointSize": 6, - "stacking": { - "mode": "none", - "group": "A" - }, - "axisPlacement": "auto", - "axisLabel": "", - "scaleDistribution": { - "type": "linear" - }, - "hideFrom": { - "tooltip": false, - "viz": false, - "legend": false - }, - "thresholdsStyle": { - "mode": "off" - } - }, - "color": { - "mode": "palette-classic" - }, - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green", - "value": null - } - ] - }, - "mappings": [], - "links": [], - "unit": "percent", - "decimals": 1, - "min": 0 - }, - "overrides": [ - { - "matcher": { - "id": "byRegexp", - "options": "/Trend/" - }, - "properties": [ - { - "id": "custom.fillOpacity", - "value": 0 - }, - { - "id": "custom.lineWidth", - "value": 4 - }, - { - "id": "custom.lineStyle", - "value": { - "fill": "dash", - "dash": [ - 4, - 10 - ] - } - } - ] - } - ] - }, - "options": { - "tooltip": { - "mode": "single" - }, - "legend": { - "displayMode": "table", - "placement": "right", - "calcs": [ - "max", - "mean", - "lastNotNull" - ] - } - }, - "targets": [ - { - "alias": "$tag_host: Loss Current", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "type": "tag", - "params": [ - "host" - ] - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "measurement": "zeekcaptureloss", - "orderByTime": "ASC", - "policy": "default", - "refId": "A", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "loss" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], - "tags": [ - { - "key": "host", - "operator": "=~", - "value": "/^$servername$/" - } - ] - }, - { - "alias": "$tag_host: Loss Trend", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "hide": true, - "measurement": "zeekcaptureloss", - "orderByTime": "ASC", - "policy": "so_long_term", - "refId": "B", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "mean_loss" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], - "tags": [ - { - "key": "host", - "operator": "=~", - "value": "/^$servername$/" - } - ] - } - ], - "maxDataPoints": null, - "timeFrom": null, - "timeShift": null -} diff --git a/salt/grafana/panels/zeek_packet_loss_graph.json.jinja b/salt/grafana/panels/zeek_packet_loss_graph.json.jinja deleted file mode 100644 index 7d2c8ae2b..000000000 --- a/salt/grafana/panels/zeek_packet_loss_graph.json.jinja +++ /dev/null @@ -1,244 +0,0 @@ -{ - "id": 2022, - "gridPos": { - "x": {{ PANELS.zeek_packet_loss_graph.gridPos.x }}, - "y": {{ PANELS.zeek_packet_loss_graph.gridPos.y }}, - "w": {{ PANELS.zeek_packet_loss_graph.gridPos.w }}, - "h": {{ PANELS.zeek_packet_loss_graph.gridPos.h }} - }, - "type": "timeseries", - "title": "Zeek Packet Loss", - "datasource": "InfluxDB", - "pluginVersion": "8.2.1", - "interval": "30s", - "links": [], - "fieldConfig": { - "defaults": { - "custom": { - "drawStyle": "line", - "lineInterpolation": "linear", - "barAlignment": 0, - "lineWidth": 1, - "fillOpacity": 0, - "gradientMode": "none", - "spanNulls": false, - "showPoints": "never", - "pointSize": 5, - "stacking": { - "mode": "none", - "group": "A" - }, - "axisPlacement": "auto", - "axisLabel": "", - "scaleDistribution": { - "type": "linear" - }, - "hideFrom": { - "tooltip": false, - "viz": false, - "legend": false - }, - "thresholdsStyle": { - "mode": "off" - }, - "lineStyle": { - "fill": "solid" - } - }, - "color": { - "mode": "palette-classic" - }, - "thresholds": { - "mode": "absolute", - "steps": [ - { - "value": null, - "color": "green" - }, - { - "value": 80, - "color": "red" - } - ] - }, - "mappings": [], - "links": [], - "unit": "percent", - "min": 0, - "decimals": 1 - }, - "overrides": [ - { - "matcher": { - "id": "byRegexp", - "options": "/Trend/" - }, - "properties": [ - { - "id": "custom.fillOpacity", - "value": 0 - }, - { - "id": "custom.lineWidth", - "value": 4 - }, - { - "id": "custom.lineStyle", - "value": { - "fill": "dash", - "dash": [ - 4, - 10 - ] - } - } - ] - } - ] - }, - "options": { - "tooltip": { - "mode": "single" - }, - "legend": { - "displayMode": "table", - "placement": "right", - "calcs": [ - "max", - "mean", - "lastNotNull" - ] - } - }, - "targets": [ - { - "alias": "Current $tag_host $tag_role", - "dsType": "influxdb", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "host" - ], - "type": "tag" - }, - { - "params": [ - "role" - ], - "type": "tag" - }, - { - "params": [ - "none" - ], - "type": "fill" - } - ], - "measurement": "zeekdrop", - "orderByTime": "ASC", - "policy": "default", - "refId": "A", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "drop" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - }, - { - "params": [ - "* 100" - ], - "type": "math" - } - ] - ], - "tags": [ - { - "key": "host", - "operator": "=~", - "value": "/^$servername$/" - } - ] - }, - { - "alias": "Trend $tag_host $tag_role", - "dsType": "influxdb", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "host" - ], - "type": "tag" - }, - { - "params": [ - "role" - ], - "type": "tag" - }, - { - "params": [ - "none" - ], - "type": "fill" - } - ], - "hide": {{ PANELS.zeek_packet_loss_graph.get('hideTrend', false)|json }}, - "measurement": "zeekdrop", - "orderByTime": "ASC", - "policy": "so_long_term", - "refId": "B", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "mean_drop" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - }, - { - "params": [ - "* 100" - ], - "type": "math" - } - ] - ], - "tags": [ - { - "key": "host", - "operator": "=~", - "value": "/^$servername$/" - } - ] - } - ], - "maxDataPoints": null, - "cacheTimeout": null, - "timeFrom": null, - "timeShift": null -} diff --git a/salt/grafana/panels/zeek_packet_loss_stat.json.jinja b/salt/grafana/panels/zeek_packet_loss_stat.json.jinja deleted file mode 100644 index 9d43f5a76..000000000 --- a/salt/grafana/panels/zeek_packet_loss_stat.json.jinja +++ /dev/null @@ -1,120 +0,0 @@ -{ - "datasource": "InfluxDB", - "fieldConfig": { - "defaults": { - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "dark-green", - "value": null - }, - { - "color": "rgba(237, 129, 40, 0.89)", - "value": 1 - }, - { - "color": "dark-red", - "value": 5 - } - ] - }, - "mappings": [ - { - "op": "=", - "text": "N/A", - "value": "null", - "$$hashKey": "object:818", - "id": 0, - "type": 1 - } - ], - "unit": "percent", - "decimals": 2, - "color": { - "mode": "thresholds" - } - }, - "overrides": [] - }, - "gridPos": { - "x": {{ PANELS.zeek_packet_loss_stat.gridPos.x }}, - "y": {{ PANELS.zeek_packet_loss_stat.gridPos.y }}, - "w": {{ PANELS.zeek_packet_loss_stat.gridPos.w }}, - "h": {{ PANELS.zeek_packet_loss_stat.gridPos.h }} - }, - "id": 2123, - "links": [], - "maxDataPoints": 100, - "targets": [ - { - "dsType": "influxdb", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "measurement": "zeekdrop", - "orderByTime": "ASC", - "policy": "default", - "refId": "A", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "drop" - ], - "type": "field" - }, - { - "params": [], - "type": "last" - }, - { - "params": [ - "* 100" - ], - "type": "math" - } - ] - ], - "tags": [ - { - "key": "host", - "operator": "=", - "value": "$servername" - } - ] - } - ], - "title": "Zeek Packet Loss", - "type": "stat", - "options": { - "reduceOptions": { - "values": false, - "calcs": [ - "lastNotNull" - ], - "fields": "" - }, - "orientation": "horizontal", - "text": {}, - "textMode": "value", - "colorMode": "value", - "graphMode": "area", - "justifyMode": "auto" - }, - "pluginVersion": "7.5.4", - "cacheTimeout": null, - "interval": null -} diff --git a/salt/grafana/panels/zeek_restarts_healthcheck_stat.json.jinja b/salt/grafana/panels/zeek_restarts_healthcheck_stat.json.jinja deleted file mode 100644 index 85dda1154..000000000 --- a/salt/grafana/panels/zeek_restarts_healthcheck_stat.json.jinja +++ /dev/null @@ -1,93 +0,0 @@ -{ - "datasource": "InfluxDB", - "fieldConfig": { - "defaults": { - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green", - "value": null - }, - { - "color": "red", - "value": 1 - } - ] - }, - "mappings": [] - }, - "overrides": [] - }, - "gridPos": { - "x": {{ PANELS.zeek_restarts_healthcheck_stat.gridPos.x }}, - "y": {{ PANELS.zeek_restarts_healthcheck_stat.gridPos.y }}, - "w": {{ PANELS.zeek_restarts_healthcheck_stat.gridPos.w }}, - "h": {{ PANELS.zeek_restarts_healthcheck_stat.gridPos.h }} - }, - "id": 37, - "options": { - "reduceOptions": { - "values": false, - "calcs": [ - "sum" - ], - "fields": "" - }, - "orientation": "auto", - "text": {}, - "textMode": "auto", - "colorMode": "value", - "graphMode": "area", - "justifyMode": "auto" - }, - "pluginVersion": "7.5.4", - "targets": [ - { - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "measurement": "healthcheck", - "orderByTime": "ASC", - "policy": "default", - "refId": "A", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "zeek_restart" - ], - "type": "field" - }, - { - "params": [], - "type": "last" - } - ] - ], - "tags": [ - { - "key": "host", - "operator": "=", - "value": "$servername" - } - ] - } - ], - "timeFrom": null, - "timeShift": null, - "title": "Zeek Restarts via Healthcheck", - "type": "stat" -} diff --git a/salt/grafana/soc_grafana.yaml b/salt/grafana/soc_grafana.yaml deleted file mode 100644 index a1b056544..000000000 --- a/salt/grafana/soc_grafana.yaml +++ /dev/null @@ -1,49 +0,0 @@ -grafana: - config: - smtp: - enabled: - description: Enable the sending of emails from Grafana. - global: True - helpLink: grafana.html - host: - description: Hostname of the SMTP server. - global: True - helpLink: grafana.html - user: - description: Username for the SMTP server. - global: True - helpLink: grafana.html - password: - description: Password for the SMTP server. - global: True - sensitive: True - helpLink: grafana.html - cert_file: - description: Location of cert file for the SMTP server. - global: True - helpLink: grafana.html - key_file: - description: Location of key file for the SMTP server. - global: True - helpLink: grafana.html - skip_verify: - description: Verify SSL certificates. - global: True - helpLink: grafana.html - from_address: - description: The email address you would like in the From field. - global: True - helpLink: grafana.html - from_name: - description: The name displayed for the From email address. - global: True - helpLink: grafana.html - ehlo_identity: - description: Used for servers with SMTP service extensions. - global: True - helpLink: grafana.html - enterprise: - license_path: - description: Path to enterprise license key. - global: True - helpLink: grafana.html diff --git a/salt/grafana/templates/cluster_name.json b/salt/grafana/templates/cluster_name.json deleted file mode 100644 index bf6dbfb3f..000000000 --- a/salt/grafana/templates/cluster_name.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "allValue": null, - "current": { - "selected": true, - "tags": [], - "text": [{{ TEMPLATES.cluster_name.get('text', DASHBOARD)| json }}], - "value": [{{ TEMPLATES.cluster_name.get('value', DASHBOARD)| json }}] - }, - "datasource": "InfluxDB", - "definition": "show tag values with key=\"cluster_name\"", - "description": null, - "error": null, - "hide": {{ TEMPLATES.cluster_name.get('hide', 0)| json }}, - "includeAll": {{ TEMPLATES.cluster_name.get('includeAll', true)| json }}, - "label": "Cluster Name", - "multi": {{ TEMPLATES.cluster_name.get('multi', true)| json }}, - "name": "cluster_name", - "options": [], - "query": "show tag values with key=\"cluster_name\"", - "refresh": 1, - "regex": "", - "skipUrlSync": false, - "sort": 0, - "type": "query" -} diff --git a/salt/grafana/templates/containers.json b/salt/grafana/templates/containers.json deleted file mode 100644 index 955c5c8e3..000000000 --- a/salt/grafana/templates/containers.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "allValue": null, - "current": { - "selected": true, - "tags": [], - "text": [], - "value": [] - }, - "datasource": "InfluxDB", - "definition": "SHOW TAG VALUES ON telegraf WITH KEY = container_name WHERE (_name = 'docker_container_cpu') AND ((host =~ /^$servername$/) AND (_tagKey = 'container_name'))", - "description": null, - "error": null, - "hide": 0, - "includeAll": true, - "label": "Docker Containers", - "multi": true, - "name": "containers", - "options": [], - "query": "SHOW TAG VALUES ON telegraf WITH KEY = container_name WHERE (_name = 'docker_container_cpu') AND ((host =~ /^$servername$/) AND (_tagKey = 'container_name'))", - "refresh": 1, - "regex": "/so-*/", - "skipUrlSync": false, - "sort": 1, - "tagValuesQuery": "", - "tags": [], - "tagsQuery": "", - "type": "query", - "useTags": false - } diff --git a/salt/grafana/templates/cpucount.json b/salt/grafana/templates/cpucount.json deleted file mode 100644 index c41889565..000000000 --- a/salt/grafana/templates/cpucount.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "allValue": null, - "current": {}, - "datasource": "InfluxDB", - "definition": "SELECT last(\"n_cpus\") FROM \"system\" WHERE \"host\" =~ /^$servername$/", - "description": null, - "error": null, - "hide": 2, - "includeAll": false, - "label": "CPU Count", - "multi": false, - "name": "cpucount", - "options": [], - "query": "SELECT last(\"n_cpus\") FROM \"system\" WHERE \"host\" =~ /^$servername$/", - "refresh": 1, - "regex": "", - "skipUrlSync": false, - "sort": 0, - "tagValuesQuery": "", - "tags": [], - "tagsQuery": "", - "type": "query", - "useTags": false - } diff --git a/salt/grafana/templates/disk.json b/salt/grafana/templates/disk.json deleted file mode 100644 index ac1b190af..000000000 --- a/salt/grafana/templates/disk.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "allValue": null, - "current": { - "selected": false, - "text": "All", - "value": "$__all" - }, - "datasource": "InfluxDB", - "definition": "", - "description": null, - "error": null, - "hide": 0, - "includeAll": true, - "label": "Disk", - "multi": true, - "name": "disk", - "options": [], - "query": "SHOW TAG VALUES ON telegraf FROM \"diskio\" WITH KEY = \"name\" WHERE host =~ /$servername/", - "refresh": 1, - "regex": "[a-z]d[\\D]$|nvme[\\d]n[\\d]$", - "skipUrlSync": false, - "sort": 0, - "tagValuesQuery": null, - "tags": [], - "tagsQuery": null, - "type": "query", - "useTags": false -} - - - - - - - - - - - diff --git a/salt/grafana/templates/manint.json b/salt/grafana/templates/manint.json deleted file mode 100644 index 22015d274..000000000 --- a/salt/grafana/templates/manint.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "allValue": null, - "current": { - "selected": true, - "tags": [], - "text": [], - "value": [] - }, - "datasource": "InfluxDB", - "definition": "SELECT \"manint\" FROM \"node_config\" WHERE (\"host\" =~ /^$servername$/)", - "description": null, - "error": null, - "hide": 2, - "includeAll": true, - "label": "Management Interface", - "multi": true, - "name": "manint", - "options": [], - "query": "SELECT \"manint\" FROM \"node_config\" WHERE (\"host\" =~ /^$servername$/)", - "refresh": 1, - "regex": "", - "skipUrlSync": false, - "sort": 0, - "tagValuesQuery": "", - "tags": [], - "tagsQuery": "", - "type": "query", - "useTags": false - } diff --git a/salt/grafana/templates/monint.json b/salt/grafana/templates/monint.json deleted file mode 100644 index 417ea8e62..000000000 --- a/salt/grafana/templates/monint.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "allValue": null, - "current": { - "selected": true, - "tags": [], - "text": [], - "value": [] - }, - "datasource": "InfluxDB", - "definition": "SELECT \"monint\" FROM \"node_config\" WHERE (\"host\" =~ /^$servername$/)", - "description": null, - "error": null, - "hide": 2, - "includeAll": true, - "label": "Monitor Interface", - "multi": true, - "name": "monint", - "options": [], - "query": "SELECT \"monint\" FROM \"node_config\" WHERE (\"host\" =~ /^$servername$/)", - "refresh": 1, - "regex": "", - "skipUrlSync": false, - "sort": 0, - "tagValuesQuery": "", - "tags": [], - "tagsQuery": "", - "type": "query", - "useTags": false - } diff --git a/salt/grafana/templates/role.json b/salt/grafana/templates/role.json deleted file mode 100644 index de51ff5d2..000000000 --- a/salt/grafana/templates/role.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "allValue": null, - "current": { - "selected": true, - "tags": [], - "text": [{{ TEMPLATES.role.get('text', DASHBOARD)| json }}], - "value": [{{ TEMPLATES.role.get('value', DASHBOARD)| json }}] - }, - "datasource": "InfluxDB", - "definition": "show tag values with key=\"role\"", - "description": null, - "error": null, - "hide": {{ TEMPLATES.role.get('hide', 0)| json }}, - "includeAll": {{ TEMPLATES.role.get('includeAll', true)| json }}, - "label": "Role", - "multi": {{ TEMPLATES.role.get('multi', true)| json }}, - "name": "role", - "options": [], - "query": "show tag values with key=\"role\"", - "refresh": 1, - "regex": "", - "skipUrlSync": false, - "sort": 1, - "tagValuesQuery": "", - "tags": [], - "tagsQuery": "", - "type": "query", - "useTags": false -} diff --git a/salt/grafana/templates/searchnode.json b/salt/grafana/templates/searchnode.json deleted file mode 100644 index 57365cc57..000000000 --- a/salt/grafana/templates/searchnode.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "allValue": null, - "current": { - "selected": true, - "tags": [], - "text": [{{ TEMPLATES.searchnode.get('text', DASHBOARD)| json }}], - "value": [{{ TEMPLATES.searchnode.get('value', DASHBOARD)| json }}] - }, - "datasource": "InfluxDB", - "definition": "show tag values with key=\"host\" WHERE (\"role\" =~ /search/) OR (\"role\" = 'heavynode') OR (\"role\" = 'standalone') OR (\"role\" = 'eval') ", - "description": null, - "error": null, - "hide": {{ TEMPLATES.searchnode.get('hide', 0)| json }}, - "includeAll": {{ TEMPLATES.searchnode.get('includeAll', true)| json }}, - "label": "Searchnode", - "multi": {{ TEMPLATES.searchnode.get('multi', true)| json }}, - "name": "searchnode", - "options": [], - "query": "show tag values with key=\"host\" WHERE (\"role\" =~ /search/) OR (\"role\" = 'heavynode') OR (\"role\" = 'standalone') OR (\"role\" = 'eval') ", - "refresh": 1, - "regex": "", - "skipUrlSync": false, - "sort": 0, - "type": "query" -} diff --git a/salt/grafana/templates/servername.json b/salt/grafana/templates/servername.json deleted file mode 100644 index aaa90acfc..000000000 --- a/salt/grafana/templates/servername.json +++ /dev/null @@ -1,34 +0,0 @@ -{% if DASHBOARD == 'overview' %} - {% set query = "show tag values with key=\\\"host\\\" WHERE (\\\"role\\\" =~ /^$role$/)" %} -{% else %} -{% set query = "show tag values with key=\\\"host\\\" WHERE (\\\"role\\\" = '" ~ DASHBOARD ~ "' )" %} -{% endif %} -{ - "allValue": null, - "current": { - "selected": true, - "tags": [], - "text": [{{ TEMPLATES.servername.get('text', '')| json }}], - "value": [{{ TEMPLATES.servername.get('value', '')| json }}] - }, - "datasource": "InfluxDB", - "definition": "{{ query }}", - "description": "", - "error": null, - "hide": 0, - "includeAll": true, - "label": "Node", - "multi": true, - "name": "servername", - "options": [], - "query": "{{ query }}", - "refresh": 1, - "regex": "", - "skipUrlSync": false, - "sort": 1, - "tagValuesQuery": "", - "tags": [], - "tagsQuery": "", - "type": "query", - "useTags": false - } From 9d4e4830dd2cba3636b57b8e289f4d6c04ef1e18 Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Fri, 17 Feb 2023 14:19:29 -0500 Subject: [PATCH 28/83] add podman state --- salt/podman/files/podman.service | 17 +++++++++++ salt/podman/files/podman.socket | 10 +++++++ salt/podman/init.sls | 51 ++++++++++++++++++++++++++++++++ 3 files changed, 78 insertions(+) create mode 100644 salt/podman/files/podman.service create mode 100644 salt/podman/files/podman.socket create mode 100644 salt/podman/init.sls diff --git a/salt/podman/files/podman.service b/salt/podman/files/podman.service new file mode 100644 index 000000000..eaa2ec437 --- /dev/null +++ b/salt/podman/files/podman.service @@ -0,0 +1,17 @@ +[Unit] +Description=Podman API Service +Requires=podman.socket +After=podman.socket +Documentation=man:podman-api(1) +StartLimitIntervalSec=0 + +[Service] +Type=oneshot +Environment=REGISTRIES_CONFIG_PATH=/etc/containers/registries.conf +ExecStart=/usr/bin/podman system service +TimeoutStopSec=30 +KillMode=process + +[Install] +WantedBy=multi-user.target +Also=podman.socket diff --git a/salt/podman/files/podman.socket b/salt/podman/files/podman.socket new file mode 100644 index 000000000..8b22e31e4 --- /dev/null +++ b/salt/podman/files/podman.socket @@ -0,0 +1,10 @@ +[Unit] +Description=Podman API Socket +Documentation=man:podman-api(1) + +[Socket] +ListenStream=%t/podman/podman.sock +SocketMode=0660 + +[Install] +WantedBy=sockets.target diff --git a/salt/podman/init.sls b/salt/podman/init.sls new file mode 100644 index 000000000..0c369c2c6 --- /dev/null +++ b/salt/podman/init.sls @@ -0,0 +1,51 @@ +Pip pkg: + pkg.installed: + - name: python3-pip + +Podman pkg: + pkg.installed: + - name: podman + +#Podman service: +# file.managed: +# - name: /usr/lib/systemd/system/podman.service +# - source: salt://podman/podman.service + +#Podman socket: +# file.managed: +# - name: /usr/lib/systemd/system/podman.socket +# - source: salt://podman/podman.socket +# service.running: +# - name: podman.socket +# - enable: true + +Docker socket: + file.symlink: + - name: /var/run/docker.sock + - target: /var/run/podman/podman.sock + +podman_docker_symlink: + file.symlink: + - name: /usr/bin/docker + - target: /usr/local/bin/podman + +Docker python: + pip.installed: + - bin_env: /usr/bin/pip3 + - reload_modules: true + - pkgs: + - certifi #==2019.11.28 + - chardet #==3.0.4 + - docker #==4.2.1 + - idna #==2.9 + # - requests==2.23.0 + - six #==1.14.0 + - urllib3 #==1.25.8 + - websocket-client #==0.57.0 + +restart_salt_minion: + cmd.run: + - name: 'salt-call service.restart salt-minion' + - bg: true + - onchanges: + - pip: Docker python From 49549c3d61914a6fc1452bbdafaf26f785e53378 Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Fri, 17 Feb 2023 14:24:55 -0500 Subject: [PATCH 29/83] remove unneedfuls from podman state --- salt/podman/init.sls | 49 ++++++++++++-------------------------------- 1 file changed, 13 insertions(+), 36 deletions(-) diff --git a/salt/podman/init.sls b/salt/podman/init.sls index 0c369c2c6..3bd77417c 100644 --- a/salt/podman/init.sls +++ b/salt/podman/init.sls @@ -1,23 +1,21 @@ -Pip pkg: - pkg.installed: - - name: python3-pip - Podman pkg: pkg.installed: - name: podman -#Podman service: -# file.managed: -# - name: /usr/lib/systemd/system/podman.service -# - source: salt://podman/podman.service +{# +Podman service: + file.managed: + - name: /usr/lib/systemd/system/podman.service + - source: salt://podman/podman.service -#Podman socket: -# file.managed: -# - name: /usr/lib/systemd/system/podman.socket -# - source: salt://podman/podman.socket -# service.running: -# - name: podman.socket -# - enable: true +Podman socket: + file.managed: + - name: /usr/lib/systemd/system/podman.socket + - source: salt://podman/podman.socket + service.running: + - name: podman.socket + - enable: true +#} Docker socket: file.symlink: @@ -28,24 +26,3 @@ podman_docker_symlink: file.symlink: - name: /usr/bin/docker - target: /usr/local/bin/podman - -Docker python: - pip.installed: - - bin_env: /usr/bin/pip3 - - reload_modules: true - - pkgs: - - certifi #==2019.11.28 - - chardet #==3.0.4 - - docker #==4.2.1 - - idna #==2.9 - # - requests==2.23.0 - - six #==1.14.0 - - urllib3 #==1.25.8 - - websocket-client #==0.57.0 - -restart_salt_minion: - cmd.run: - - name: 'salt-call service.restart salt-minion' - - bg: true - - onchanges: - - pip: Docker python From 6fd68351ecb2ec926a68d18d5ff4f46db7c5b180 Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Fri, 17 Feb 2023 14:30:55 -0500 Subject: [PATCH 30/83] fix more python depends --- setup/so-functions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup/so-functions b/setup/so-functions index b25561729..d358e9429 100755 --- a/setup/so-functions +++ b/setup/so-functions @@ -2002,7 +2002,7 @@ saltify() { if [[ $is_rocky ]]; then # THIS IS A TEMP HACK - logCmd "dnf -y install securityonion-salt python3-chardet python3-idna python3-pysocks python3-requests python3-urllib3 python3-websocket-client python3-docker" + logCmd "dnf -y install securityonion-salt python3-audit python3-libsemanage python3-policycoreutils python3-setools python3-setuptools python3-chardet python3-idna python3-pysocks python3-requests python3-urllib3 python3-websocket-client python3-docker" logCmd "mkdir -p /etc/salt/minion.d" if [[ $waitforstate ]]; then # Since this is a salt master so let's install it From 160ed46d964a93ffe9b6f82296c6e43aed12dfcd Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Fri, 17 Feb 2023 14:59:07 -0500 Subject: [PATCH 31/83] podman and remove filebeat --- salt/podman/init.sls | 20 +++++++++++++++++++- salt/top.sls | 34 ---------------------------------- setup/so-setup | 2 +- 3 files changed, 20 insertions(+), 36 deletions(-) diff --git a/salt/podman/init.sls b/salt/podman/init.sls index 3bd77417c..eb6ab5503 100644 --- a/salt/podman/init.sls +++ b/salt/podman/init.sls @@ -1,3 +1,5 @@ +{% from 'docker/docker.map.jinja' import DOCKER %} + Podman pkg: pkg.installed: - name: podman @@ -7,15 +9,18 @@ Podman service: file.managed: - name: /usr/lib/systemd/system/podman.service - source: salt://podman/podman.service +#} Podman socket: +{# file.managed: - name: /usr/lib/systemd/system/podman.socket - source: salt://podman/podman.socket +#} service.running: - name: podman.socket - enable: true -#} + Docker socket: file.symlink: @@ -26,3 +31,16 @@ podman_docker_symlink: file.symlink: - name: /usr/bin/docker - target: /usr/local/bin/podman + +sos_docker_net: + docker_network.present: + - name: sobridge + - subnet: {{ DOCKER.sorange }} + - gateway: {{ DOCKER.sobip }} + - options: + com.docker.network.bridge.name: 'sobridge' + com.docker.network.driver.mtu: '1500' + com.docker.network.bridge.enable_ip_masquerade: 'true' + com.docker.network.bridge.enable_icc: 'true' + com.docker.network.bridge.host_binding_ipv4: '0.0.0.0' + - unless: 'docker network ls | grep sobridge' diff --git a/salt/top.sls b/salt/top.sls index f0b60deb5..272e6d8a9 100644 --- a/salt/top.sls +++ b/salt/top.sls @@ -8,7 +8,6 @@ {% set PLAYBOOK = salt['pillar.get']('manager:playbook', '0') %} {% set ELASTALERT = salt['pillar.get']('elastalert:enabled', True) %} {% set ELASTICSEARCH = salt['pillar.get']('elasticsearch:enabled', True) %} -{% set FILEBEAT = salt['pillar.get']('filebeat:enabled', False) %} {% set KIBANA = salt['pillar.get']('kibana:enabled', True) %} {% set LOGSTASH = salt['pillar.get']('logstash:enabled', True) %} {% set REDIS = salt['pillar.get']('redis:enabled', True) %} @@ -62,9 +61,6 @@ base: {%- if STRELKA %} - strelka {%- endif %} - {%- if FILEBEAT %} - - filebeat - {%- endif %} - schedule - docker_clean @@ -102,9 +98,6 @@ base: {%- if STRELKA %} - strelka {%- endif %} - {%- if FILEBEAT %} - - filebeat - {%- endif %} - curator {%- if ELASTALERT %} - elastalert @@ -153,9 +146,6 @@ base: {%- if ELASTALERT %} - elastalert {%- endif %} - {%- if FILEBEAT %} - - filebeat - {%- endif %} - utility - schedule - soctopus @@ -202,9 +192,6 @@ base: {%- if STRELKA %} - strelka {%- endif %} - {%- if FILEBEAT %} - - filebeat - {%- endif %} - curator {%- if ELASTALERT %} - elastalert @@ -229,9 +216,6 @@ base: {%- if LOGSTASH %} - logstash {%- endif %} - {%- if FILEBEAT %} - - filebeat - {%- endif %} - schedule - docker_clean @@ -270,9 +254,6 @@ base: {%- if ELASTALERT %} - elastalert {%- endif %} - {%- if FILEBEAT %} - - filebeat - {%- endif %} - utility - schedule - soctopus @@ -296,9 +277,6 @@ base: - redis {%- endif %} - curator - {%- if FILEBEAT %} - - filebeat - {%- endif %} {%- if STRELKA %} - strelka {%- endif %} @@ -307,9 +285,6 @@ base: {%- if ZEEKVER != 'SURICATA' %} - zeek {%- endif %} - {%- if FILEBEAT %} - - filebeat - {%- endif %} - schedule - docker_clean @@ -336,9 +311,6 @@ base: {%- if KIBANA %} - kibana.so_savedobjects_defaults {%- endif %} - {%- if FILEBEAT %} - - filebeat - {%- endif %} - utility - suricata - zeek @@ -358,9 +330,6 @@ base: {%- if REDIS %} - redis {%- endif %} - {%- if FILEBEAT %} - - filebeat - {%- endif %} - schedule - docker_clean @@ -372,9 +341,6 @@ base: - firewall - schedule - docker_clean - {%- if FILEBEAT %} - - filebeat - {%- endif %} - idh 'J@workstation:gui:enabled:^[Tt][Rr][Uu][Ee]$ and ( G@saltversion:{{saltversion}} and G@os:Rocky )': diff --git a/setup/so-setup b/setup/so-setup index 9448a4011..f9243dfa5 100755 --- a/setup/so-setup +++ b/setup/so-setup @@ -579,7 +579,7 @@ if ! [[ -f $install_opt_file ]]; then logCmd "salt-call state.apply common.packages" logCmd "salt-call state.apply common" - logCmd "salt-call state.apply docker" + logCmd "salt-call state.apply podman" firewall_generate_templates set_initial_firewall_policy From 03cd67431d247f09aaada5d459e5940fe7a121cb Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Fri, 17 Feb 2023 15:36:45 -0500 Subject: [PATCH 32/83] start and enable podman services --- salt/podman/init.sls | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/salt/podman/init.sls b/salt/podman/init.sls index eb6ab5503..8a0303708 100644 --- a/salt/podman/init.sls +++ b/salt/podman/init.sls @@ -11,16 +11,15 @@ Podman service: - source: salt://podman/podman.service #} -Podman socket: -{# - file.managed: - - name: /usr/lib/systemd/system/podman.socket - - source: salt://podman/podman.socket -#} +Podman_socket_service: service.running: - name: podman.socket - enable: true +Podman_service: + service.running: + - name: podman.service + - enable: true Docker socket: file.symlink: From 4bafb408946c63036a33e89eab1df8912d2f0f4b Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Fri, 17 Feb 2023 15:38:54 -0500 Subject: [PATCH 33/83] fix registry from restart --- salt/registry/init.sls | 2 ++ 1 file changed, 2 insertions(+) diff --git a/salt/registry/init.sls b/salt/registry/init.sls index 428cfd81d..cb8035e44 100644 --- a/salt/registry/init.sls +++ b/salt/registry/init.sls @@ -53,6 +53,8 @@ so-dockerregistry: - /etc/pki/registry.crt:/etc/pki/registry.crt:ro - /etc/pki/registry.key:/etc/pki/registry.key:ro - client_timeout: 180 + - environment: + - HOME=/root - retry: attempts: 5 interval: 30 From 5fff06602aa72512402c5cdc1feaab799ae6eeaa Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Fri, 17 Feb 2023 15:41:42 -0500 Subject: [PATCH 34/83] change symlink --- salt/podman/init.sls | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/salt/podman/init.sls b/salt/podman/init.sls index 8a0303708..8fe1950da 100644 --- a/salt/podman/init.sls +++ b/salt/podman/init.sls @@ -29,7 +29,7 @@ Docker socket: podman_docker_symlink: file.symlink: - name: /usr/bin/docker - - target: /usr/local/bin/podman + - target: /usr/bin/podman sos_docker_net: docker_network.present: From 653062b7c9c986f86b014a77a33090c866856fd7 Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Tue, 21 Feb 2023 09:46:52 -0500 Subject: [PATCH 35/83] run podman state early --- salt/top.sls | 1 + 1 file changed, 1 insertion(+) diff --git a/salt/top.sls b/salt/top.sls index 272e6d8a9..1896d5fb3 100644 --- a/salt/top.sls +++ b/salt/top.sls @@ -21,6 +21,7 @@ base: '*': - cron.running - repo.client + - podman - ntp 'not G@saltversion:{{saltversion}}': From 173b15b46e218fbae5ced7da2eab71242b971b2e Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Tue, 21 Feb 2023 09:58:07 -0500 Subject: [PATCH 36/83] Add python3-rich for sostatus --- salt/common/packages.sls | 1 + 1 file changed, 1 insertion(+) diff --git a/salt/common/packages.sls b/salt/common/packages.sls index 9fd9f4e51..d91e1b714 100644 --- a/salt/common/packages.sls +++ b/salt/common/packages.sls @@ -50,4 +50,5 @@ commonpkgs: - python3-docker - python3-m2crypto - rsync + - python3-rich {% endif %} From 6cfa16c25119fbd50da892251e066068e61b6443 Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Tue, 21 Feb 2023 10:00:09 -0500 Subject: [PATCH 37/83] fix reposync script --- salt/common/tools/sbin/so-repo-sync | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/salt/common/tools/sbin/so-repo-sync b/salt/common/tools/sbin/so-repo-sync index 4a9cc3b18..dee71b64c 100644 --- a/salt/common/tools/sbin/so-repo-sync +++ b/salt/common/tools/sbin/so-repo-sync @@ -11,6 +11,6 @@ set_version set_os salt_minion_count -curl --retry 5 --retry-delay 60 -A 'checkin/$VERSION/$OS/$(uname -r)/$MINIONCOUNT' https://sigs.securityonion.net/checkup --output /tmp/checkup" +curl --retry 5 --retry-delay 60 -A 'checkin/$VERSION/$OS/$(uname -r)/$MINIONCOUNT' https://sigs.securityonion.net/checkup --output /tmp/checkup reposync --norepopath -n -g -l -d -m -c /root/repodownload.conf -r securityonionsync --download-metadata -p /nsm/repo/ crete_repo /nsm/repo \ No newline at end of file From f34e144629d26e9de324fca3b704e6afd8905e76 Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Tue, 21 Feb 2023 10:01:27 -0500 Subject: [PATCH 38/83] removes filebeat --- .../tools/sbin/so-filebeat-module-setup | 58 ------------------- salt/common/tools/sbin/so-filebeat-restart | 12 ---- salt/common/tools/sbin/so-filebeat-start | 12 ---- salt/common/tools/sbin/so-filebeat-stop | 12 ---- 4 files changed, 94 deletions(-) delete mode 100755 salt/common/tools/sbin/so-filebeat-module-setup delete mode 100755 salt/common/tools/sbin/so-filebeat-restart delete mode 100755 salt/common/tools/sbin/so-filebeat-start delete mode 100755 salt/common/tools/sbin/so-filebeat-stop diff --git a/salt/common/tools/sbin/so-filebeat-module-setup b/salt/common/tools/sbin/so-filebeat-module-setup deleted file mode 100755 index 43c816087..000000000 --- a/salt/common/tools/sbin/so-filebeat-module-setup +++ /dev/null @@ -1,58 +0,0 @@ -#!/bin/bash -# Copyright Security Onion Solutions LLC and/or licensed to Security Onion Solutions LLC under one -# or more contributor license agreements. Licensed under the Elastic License 2.0 as shown at -# https://securityonion.net/license; you may not use this file except in compliance with the -# Elastic License 2.0. - - - -{%- set mainint = salt['pillar.get']('host:mainint') %} -{%- set MYIP = salt['grains.get']('ip_interfaces:' ~ mainint)[0] %} - -default_conf_dir=/opt/so/conf -ELASTICSEARCH_HOST="{{ MYIP }}" -ELASTICSEARCH_PORT=9200 -#ELASTICSEARCH_AUTH="" - -# Define a default directory to load pipelines from -FB_MODULE_YML="/usr/share/filebeat/module-setup.yml" - - -# Wait for ElasticSearch to initialize -echo -n "Waiting for ElasticSearch..." -COUNT=0 -ELASTICSEARCH_CONNECTED="no" -while [[ "$COUNT" -le 240 ]]; do - curl -K /opt/so/conf/elasticsearch/curl.config -k --output /dev/null --silent --head --fail -L https://"$ELASTICSEARCH_HOST":"$ELASTICSEARCH_PORT" - if [ $? -eq 0 ]; then - ELASTICSEARCH_CONNECTED="yes" - echo "connected!" - break - else - ((COUNT+=1)) - sleep 1 - echo -n "." - fi -done -if [ "$ELASTICSEARCH_CONNECTED" == "no" ]; then - echo - echo -e "Connection attempt timed out. Unable to connect to ElasticSearch. \nPlease try: \n -checking log(s) in /var/log/elasticsearch/\n -running 'sudo docker ps' \n -running 'sudo so-elastic-restart'" - echo -fi -echo "Testing to see if the pipelines are already applied" -ESVER=$(curl -K /opt/so/conf/elasticsearch/curl.config -sk https://"$ELASTICSEARCH_HOST":"$ELASTICSEARCH_PORT" |jq .version.number |tr -d \") -PIPELINES=$(curl -K /opt/so/conf/elasticsearch/curl.config -sk https://"$ELASTICSEARCH_HOST":"$ELASTICSEARCH_PORT"/_ingest/pipeline/filebeat-$ESVER-elasticsearch-server-pipeline | jq . | wc -c) - -if [[ "$PIPELINES" -lt 5 ]] || [ "$2" != "--force" ]; then - echo "Setting up ingest pipeline(s)" -{% from 'filebeat/modules.map.jinja' import MODULESMERGED with context %} -{%- for module in MODULESMERGED.modules.keys() %} - {%- for fileset in MODULESMERGED.modules[module] %} - echo "{{ module }}.{{ fileset}}" - docker exec -i so-filebeat filebeat setup --pipelines --modules {{ module }} -M "{{ module }}.{{ fileset }}.enabled=true" -c $FB_MODULE_YML - sleep 0.5 - {% endfor %} -{%- endfor %} -else - exit 0 -fi diff --git a/salt/common/tools/sbin/so-filebeat-restart b/salt/common/tools/sbin/so-filebeat-restart deleted file mode 100755 index 97ccbb0ee..000000000 --- a/salt/common/tools/sbin/so-filebeat-restart +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/bash - -# Copyright Security Onion Solutions LLC and/or licensed to Security Onion Solutions LLC under one -# or more contributor license agreements. Licensed under the Elastic License 2.0 as shown at -# https://securityonion.net/license; you may not use this file except in compliance with the -# Elastic License 2.0. - - - -. /usr/sbin/so-common - -/usr/sbin/so-restart filebeat $1 diff --git a/salt/common/tools/sbin/so-filebeat-start b/salt/common/tools/sbin/so-filebeat-start deleted file mode 100755 index cf148d49a..000000000 --- a/salt/common/tools/sbin/so-filebeat-start +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/bash - -# Copyright Security Onion Solutions LLC and/or licensed to Security Onion Solutions LLC under one -# or more contributor license agreements. Licensed under the Elastic License 2.0 as shown at -# https://securityonion.net/license; you may not use this file except in compliance with the -# Elastic License 2.0. - - - -. /usr/sbin/so-common - -/usr/sbin/so-start filebeat $1 diff --git a/salt/common/tools/sbin/so-filebeat-stop b/salt/common/tools/sbin/so-filebeat-stop deleted file mode 100755 index d3c50fef0..000000000 --- a/salt/common/tools/sbin/so-filebeat-stop +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/bash - -# Copyright Security Onion Solutions LLC and/or licensed to Security Onion Solutions LLC under one -# or more contributor license agreements. Licensed under the Elastic License 2.0 as shown at -# https://securityonion.net/license; you may not use this file except in compliance with the -# Elastic License 2.0. - - - -. /usr/sbin/so-common - -/usr/sbin/so-stop filebeat $1 From b402b84d11e5924981269a80399426d572966a91 Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Tue, 21 Feb 2023 10:04:56 -0500 Subject: [PATCH 39/83] fix reposync --- salt/common/tools/sbin/so-repo-sync | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/salt/common/tools/sbin/so-repo-sync b/salt/common/tools/sbin/so-repo-sync index dee71b64c..8ee9e0581 100644 --- a/salt/common/tools/sbin/so-repo-sync +++ b/salt/common/tools/sbin/so-repo-sync @@ -12,5 +12,5 @@ set_os salt_minion_count curl --retry 5 --retry-delay 60 -A 'checkin/$VERSION/$OS/$(uname -r)/$MINIONCOUNT' https://sigs.securityonion.net/checkup --output /tmp/checkup -reposync --norepopath -n -g -l -d -m -c /root/repodownload.conf -r securityonionsync --download-metadata -p /nsm/repo/ -crete_repo /nsm/repo \ No newline at end of file +dnf reposync --norepopath -n -g --delete -m -c /root/repodownload.conf --repoid=securityonionsync --download-metadata -p /nsm/repo/ +creterepo /nsm/repo \ No newline at end of file From c4a54704549063827ceac3efae37eb809a5f9d47 Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Tue, 21 Feb 2023 10:06:01 -0500 Subject: [PATCH 40/83] fix reposync --- salt/common/tools/sbin/so-repo-sync | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/salt/common/tools/sbin/so-repo-sync b/salt/common/tools/sbin/so-repo-sync index 8ee9e0581..9ea697673 100644 --- a/salt/common/tools/sbin/so-repo-sync +++ b/salt/common/tools/sbin/so-repo-sync @@ -13,4 +13,4 @@ salt_minion_count curl --retry 5 --retry-delay 60 -A 'checkin/$VERSION/$OS/$(uname -r)/$MINIONCOUNT' https://sigs.securityonion.net/checkup --output /tmp/checkup dnf reposync --norepopath -n -g --delete -m -c /root/repodownload.conf --repoid=securityonionsync --download-metadata -p /nsm/repo/ -creterepo /nsm/repo \ No newline at end of file +createrepo /nsm/repo \ No newline at end of file From bc054a15d31eb0f1b440a1718b651d3fdfd4c80d Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Tue, 21 Feb 2023 10:15:47 -0500 Subject: [PATCH 41/83] add createrepo --- setup/so-functions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup/so-functions b/setup/so-functions index d358e9429..da20019c1 100755 --- a/setup/so-functions +++ b/setup/so-functions @@ -877,7 +877,7 @@ create_manager_pillars() { create_repo() { title "Create the repo directory" - logCmd "dnf -y install yum-utils" + logCmd "dnf -y install yum-utils createrepo" logCmd "createrepo /nsm/repo" } From a3bda9b3220c4cd22fb45bcf1c8b409c21b0c9a3 Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Tue, 21 Feb 2023 13:48:03 -0500 Subject: [PATCH 42/83] podman changes to disable mgmt of iptables --- salt/firewall/assigned_hostgroups.map.yaml | 3 ++ salt/podman/files/sobridge.conflist | 48 ++++++++++++++++++++++ salt/podman/init.sls | 11 +++++ 3 files changed, 62 insertions(+) create mode 100644 salt/podman/files/sobridge.conflist diff --git a/salt/firewall/assigned_hostgroups.map.yaml b/salt/firewall/assigned_hostgroups.map.yaml index 25dbba1b0..10ddae371 100644 --- a/salt/firewall/assigned_hostgroups.map.yaml +++ b/salt/firewall/assigned_hostgroups.map.yaml @@ -254,6 +254,9 @@ role: chain: DOCKER-USER: hostgroups: + localhost: + portgroups: + - {{ portgroups.all }} standalone: portgroups: - {{ portgroups.playbook }} diff --git a/salt/podman/files/sobridge.conflist b/salt/podman/files/sobridge.conflist new file mode 100644 index 000000000..45a7e2df9 --- /dev/null +++ b/salt/podman/files/sobridge.conflist @@ -0,0 +1,48 @@ +{ + "args": { + "podman_options": { + "isolate": "true", + "mtu": "1500" + } + }, + "cniVersion": "0.4.0", + "name": "sobridge", + "plugins": [ + { + "type": "bridge", + "bridge": "sobridge", + "isGateway": true, + "ipMasq": false, + "mtu": 1500, + "hairpinMode": false, + "ipam": { + "type": "host-local", + "routes": [ + { + "dst": "0.0.0.0/0" + } + ], + "ranges": [ + [ + { + "subnet": "172.17.1.0/24", + "gateway": "172.17.1.1" + } + ] + ] + }, + "capabilities": { + "ips": true + } + }, + { + "type": "portmap", + "capabilities": { + "portMappings": false + } + }, + { + "type": "tuning" + } + ] +} diff --git a/salt/podman/init.sls b/salt/podman/init.sls index 8fe1950da..d5efa0fdb 100644 --- a/salt/podman/init.sls +++ b/salt/podman/init.sls @@ -4,6 +4,10 @@ Podman pkg: pkg.installed: - name: podman +cnipkg: + pkg.installed: + - name: containernetworking-plugins + {# Podman service: file.managed: @@ -11,6 +15,11 @@ Podman service: - source: salt://podman/podman.service #} +sobridgeconf: + file.managed: + - name: /etc/cni/net.d/sobridge.conflist + - source: salt://podman/files/sobridge.conflist + Podman_socket_service: service.running: - name: podman.socket @@ -31,6 +40,7 @@ podman_docker_symlink: - name: /usr/bin/docker - target: /usr/bin/podman +{# sos_docker_net: docker_network.present: - name: sobridge @@ -43,3 +53,4 @@ sos_docker_net: com.docker.network.bridge.enable_icc: 'true' com.docker.network.bridge.host_binding_ipv4: '0.0.0.0' - unless: 'docker network ls | grep sobridge' +#} From de499ead0cec88b8f940bd5b4e2f9d9d65698065 Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Tue, 21 Feb 2023 15:11:14 -0500 Subject: [PATCH 43/83] update fw rules --- salt/firewall/iptables.jinja | 2 -- 1 file changed, 2 deletions(-) diff --git a/salt/firewall/iptables.jinja b/salt/firewall/iptables.jinja index ec2a5ae65..4d6ece25a 100644 --- a/salt/firewall/iptables.jinja +++ b/salt/firewall/iptables.jinja @@ -93,7 +93,6 @@ COMMIT -A INPUT -m conntrack --ctstate RELATED,ESTABLISHED -j ACCEPT -A INPUT -i lo -j ACCEPT -A INPUT -m conntrack --ctstate INVALID -j DROP --A INPUT -j REJECT --reject-with icmp-host-prohibited -A INPUT -p icmp -j ACCEPT -A INPUT -j LOGGING -A FORWARD -j DOCKER-USER @@ -106,7 +105,6 @@ COMMIT -A FORWARD -i lo -j ACCEPT -A FORWARD -m conntrack --ctstate INVALID -j DROP -A FORWARD -j REJECT --reject-with icmp-host-prohibited --A OUTPUT -o lo -j ACCEPT -A OUTPUT -p icmp -m icmp --icmp-type 14 -j DROP {%- for rule in D2 %} From f2b0d67d8ba7a8d69b7f32fc954b70cb2ab0ab32 Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Tue, 21 Feb 2023 15:20:49 -0500 Subject: [PATCH 44/83] update fw rules --- salt/firewall/iptables.jinja | 4 ---- 1 file changed, 4 deletions(-) diff --git a/salt/firewall/iptables.jinja b/salt/firewall/iptables.jinja index 4d6ece25a..142f41ce8 100644 --- a/salt/firewall/iptables.jinja +++ b/salt/firewall/iptables.jinja @@ -101,10 +101,6 @@ COMMIT -A FORWARD -o sobridge -j DOCKER -A FORWARD -i sobridge ! -o sobridge -j ACCEPT -A FORWARD -i sobridge -o sobridge -j ACCEPT --A FORWARD -m conntrack --ctstate RELATED,ESTABLISHED -j ACCEPT --A FORWARD -i lo -j ACCEPT --A FORWARD -m conntrack --ctstate INVALID -j DROP --A FORWARD -j REJECT --reject-with icmp-host-prohibited -A OUTPUT -p icmp -m icmp --icmp-type 14 -j DROP {%- for rule in D2 %} From cc654fda9f286f4ca5cf0fd8a80579117f3759a4 Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Tue, 21 Feb 2023 15:43:41 -0500 Subject: [PATCH 45/83] fw 2.4 update --- salt/firewall/iptables.jinja | 1 - 1 file changed, 1 deletion(-) diff --git a/salt/firewall/iptables.jinja b/salt/firewall/iptables.jinja index 142f41ce8..8aea5ed36 100644 --- a/salt/firewall/iptables.jinja +++ b/salt/firewall/iptables.jinja @@ -91,7 +91,6 @@ COMMIT {%- endfor %} -A INPUT -m conntrack --ctstate RELATED,ESTABLISHED -j ACCEPT --A INPUT -i lo -j ACCEPT -A INPUT -m conntrack --ctstate INVALID -j DROP -A INPUT -p icmp -j ACCEPT -A INPUT -j LOGGING From 8645cd0c3b4bdfa67fd25b107b0aac3c0d617596 Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Wed, 22 Feb 2023 08:57:00 -0500 Subject: [PATCH 46/83] add docker --- salt/docker/init.sls | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/salt/docker/init.sls b/salt/docker/init.sls index 37208650e..985838780 100644 --- a/salt/docker/init.sls +++ b/salt/docker/init.sls @@ -26,12 +26,10 @@ dockerheldpackages: dockerheldpackages: pkg.installed: - pkgs: - - containerd.io: 1.4.4-3.1.el7 - - docker-ce: 3:20.10.5-3.el7 - - docker-ce-cli: 1:20.10.5-3.el7 - - docker-ce-rootless-extras: 20.10.5-3.el7 - - hold: True - - update_holds: True + - containerd.io + - docker-ce + - docker-ce-cli + - docker-ce-rootless-extras {% endif %} #disable docker from managing iptables From 7b6db5d95acbb239c90cdbe2cee5b1f85c87f640 Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Wed, 22 Feb 2023 09:08:39 -0500 Subject: [PATCH 47/83] add docker --- salt/docker/init.sls | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/salt/docker/init.sls b/salt/docker/init.sls index 985838780..f2a4c80a9 100644 --- a/salt/docker/init.sls +++ b/salt/docker/init.sls @@ -26,10 +26,12 @@ dockerheldpackages: dockerheldpackages: pkg.installed: - pkgs: - - containerd.io - - docker-ce - - docker-ce-cli - - docker-ce-rootless-extras + - containerd.io: 1.6.18-3.1.el9 + - docker-ce: 23.0.1-1.el9 + - docker-ce-cli: 23.0.1-1.el9 + - docker-ce-rootless-extras: 23.0.1-1.el9 + - hold: True + - update_holds: True {% endif %} #disable docker from managing iptables From 56ccf5c5044670447ef3a120dbf6b0911f1b1aa1 Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Wed, 22 Feb 2023 09:13:16 -0500 Subject: [PATCH 48/83] remove podman --- salt/top.sls | 1 - setup/so-setup | 1 - 2 files changed, 2 deletions(-) diff --git a/salt/top.sls b/salt/top.sls index 1896d5fb3..272e6d8a9 100644 --- a/salt/top.sls +++ b/salt/top.sls @@ -21,7 +21,6 @@ base: '*': - cron.running - repo.client - - podman - ntp 'not G@saltversion:{{saltversion}}': diff --git a/setup/so-setup b/setup/so-setup index f9243dfa5..ce2f42f6e 100755 --- a/setup/so-setup +++ b/setup/so-setup @@ -579,7 +579,6 @@ if ! [[ -f $install_opt_file ]]; then logCmd "salt-call state.apply common.packages" logCmd "salt-call state.apply common" - logCmd "salt-call state.apply podman" firewall_generate_templates set_initial_firewall_policy From 327855b0af6d691c04a659dbe184f9fc20a5478c Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Wed, 22 Feb 2023 09:28:51 -0500 Subject: [PATCH 49/83] add docker --- salt/common/tools/sbin/so-common | 2 +- salt/repo/client/files/rocky/keys/docker.pub | 28 ++++++++++++++++++++ 2 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 salt/repo/client/files/rocky/keys/docker.pub diff --git a/salt/common/tools/sbin/so-common b/salt/common/tools/sbin/so-common index d66a6cc6f..dc5ae2123 100755 --- a/salt/common/tools/sbin/so-common +++ b/salt/common/tools/sbin/so-common @@ -194,7 +194,7 @@ gpg_rpm_import() { local RPMKEYSLOC="$UPDATE_DIR/salt/repo/client/files/rocky/keys" fi - RPMKEYS=('RPM-GPG-KEY-EPEL-9' 'SALTSTACK-GPG-KEY2.pub' 'securityonion.pub') + RPMKEYS=('RPM-GPG-KEY-EPEL-9' 'SALTSTACK-GPG-KEY2.pub' 'docker.pub' 'securityonion.pub') for RPMKEY in "${RPMKEYS[@]}"; do rpm --import $RPMKEYSLOC/$RPMKEY diff --git a/salt/repo/client/files/rocky/keys/docker.pub b/salt/repo/client/files/rocky/keys/docker.pub new file mode 100644 index 000000000..1967cbf01 --- /dev/null +++ b/salt/repo/client/files/rocky/keys/docker.pub @@ -0,0 +1,28 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +mQINBFit5IEBEADDt86QpYKz5flnCsOyZ/fk3WwBKxfDjwHf/GIflo+4GWAXS7wJ +1PSzPsvSDATV10J44i5WQzh99q+lZvFCVRFiNhRmlmcXG+rk1QmDh3fsCCj9Q/yP +w8jn3Hx0zDtz8PIB/18ReftYJzUo34COLiHn8WiY20uGCF2pjdPgfxE+K454c4G7 +gKFqVUFYgPug2CS0quaBB5b0rpFUdzTeI5RCStd27nHCpuSDCvRYAfdv+4Y1yiVh +KKdoe3Smj+RnXeVMgDxtH9FJibZ3DK7WnMN2yeob6VqXox+FvKYJCCLkbQgQmE50 +uVK0uN71A1mQDcTRKQ2q3fFGlMTqJbbzr3LwnCBE6hV0a36t+DABtZTmz5O69xdJ +WGdBeePCnWVqtDb/BdEYz7hPKskcZBarygCCe2Xi7sZieoFZuq6ltPoCsdfEdfbO ++VBVKJnExqNZCcFUTEnbH4CldWROOzMS8BGUlkGpa59Sl1t0QcmWlw1EbkeMQNrN +spdR8lobcdNS9bpAJQqSHRZh3cAM9mA3Yq/bssUS/P2quRXLjJ9mIv3dky9C3udM ++q2unvnbNpPtIUly76FJ3s8g8sHeOnmYcKqNGqHq2Q3kMdA2eIbI0MqfOIo2+Xk0 +rNt3ctq3g+cQiorcN3rdHPsTRSAcp+NCz1QF9TwXYtH1XV24A6QMO0+CZwARAQAB +tCtEb2NrZXIgUmVsZWFzZSAoQ0UgcnBtKSA8ZG9ja2VyQGRvY2tlci5jb20+iQI3 +BBMBCgAhBQJYrep4AhsvBQsJCAcDBRUKCQgLBRYCAwEAAh4BAheAAAoJEMUv62ti +Hp816C0P/iP+1uhSa6Qq3TIc5sIFE5JHxOO6y0R97cUdAmCbEqBiJHUPNQDQaaRG +VYBm0K013Q1gcJeUJvS32gthmIvhkstw7KTodwOM8Kl11CCqZ07NPFef1b2SaJ7l +TYpyUsT9+e343ph+O4C1oUQw6flaAJe+8ATCmI/4KxfhIjD2a/Q1voR5tUIxfexC +/LZTx05gyf2mAgEWlRm/cGTStNfqDN1uoKMlV+WFuB1j2oTUuO1/dr8mL+FgZAM3 +ntWFo9gQCllNV9ahYOON2gkoZoNuPUnHsf4Bj6BQJnIXbAhMk9H2sZzwUi9bgObZ +XO8+OrP4D4B9kCAKqqaQqA+O46LzO2vhN74lm/Fy6PumHuviqDBdN+HgtRPMUuao +xnuVJSvBu9sPdgT/pR1N9u/KnfAnnLtR6g+fx4mWz+ts/riB/KRHzXd+44jGKZra +IhTMfniguMJNsyEOO0AN8Tqcl0eRBxcOArcri7xu8HFvvl+e+ILymu4buusbYEVL +GBkYP5YMmScfKn+jnDVN4mWoN1Bq2yMhMGx6PA3hOvzPNsUoYy2BwDxNZyflzuAi +g59mgJm2NXtzNbSRJbMamKpQ69mzLWGdFNsRd4aH7PT7uPAURaf7B5BVp3UyjERW +5alSGnBqsZmvlRnVH5BDUhYsWZMPRQS9rRr4iGW0l+TH+O2VJ8aQ +=0Zqq +-----END PGP PUBLIC KEY BLOCK----- From 53b58d532af9d993ca31034aa631e8de715b7d97 Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Wed, 22 Feb 2023 09:35:37 -0500 Subject: [PATCH 50/83] apply docker state during setup --- setup/so-setup | 1 + 1 file changed, 1 insertion(+) diff --git a/setup/so-setup b/setup/so-setup index ce2f42f6e..9448a4011 100755 --- a/setup/so-setup +++ b/setup/so-setup @@ -579,6 +579,7 @@ if ! [[ -f $install_opt_file ]]; then logCmd "salt-call state.apply common.packages" logCmd "salt-call state.apply common" + logCmd "salt-call state.apply docker" firewall_generate_templates set_initial_firewall_policy From d0bb7dc475d6c3c59d47c588219d61556069f702 Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Wed, 22 Feb 2023 10:04:43 -0500 Subject: [PATCH 51/83] repo for rocky --- .../rocky/keys/RPM-GPG-KEY-rockyofficial | 29 +++++++++ salt/repo/client/files/rocky/yum.conf.jinja | 17 +++++ salt/repo/client/rocky.sls | 62 +++++++++++++++++++ 3 files changed, 108 insertions(+) create mode 100644 salt/repo/client/files/rocky/keys/RPM-GPG-KEY-rockyofficial create mode 100644 salt/repo/client/files/rocky/yum.conf.jinja create mode 100644 salt/repo/client/rocky.sls diff --git a/salt/repo/client/files/rocky/keys/RPM-GPG-KEY-rockyofficial b/salt/repo/client/files/rocky/keys/RPM-GPG-KEY-rockyofficial new file mode 100644 index 000000000..28ce769ce --- /dev/null +++ b/salt/repo/client/files/rocky/keys/RPM-GPG-KEY-rockyofficial @@ -0,0 +1,29 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +mQINBGAofzYBEAC6yS1azw6f3wmaVd//3aSy6O2c9+jeetulRQvg2LvhRRS1eNqp +/x9tbBhfohu/tlDkGpYHV7diePgMml9SZDy1sKlI3tDhx6GZ3xwF0fd1vWBZpmNk +D9gRkUmYBeLotmcXQZ8ZpWLicosFtDpJEYpLUhuIgTKwt4gxJrHvkWsGQiBkJxKD +u3/RlL4IYA3Ot9iuCBflc91EyAw1Yj0gKcDzbOqjvlGtS3ASXgxPqSfU0uLC9USF +uKDnP2tcnlKKGfj0u6VkqISliSuRAzjlKho9Meond+mMIFOTT6qp4xyu+9Dj3IjZ +IC6rBXRU3xi8z0qYptoFZ6hx70NV5u+0XUzDMXdjQ5S859RYJKijiwmfMC7gZQAf +OkdOcicNzen/TwD/slhiCDssHBNEe86Wwu5kmDoCri7GJlYOlWU42Xi0o1JkVltN +D8ZId+EBDIms7ugSwGOVSxyZs43q2IAfFYCRtyKHFlgHBRe9/KTWPUrnsfKxGJgC +Do3Yb63/IYTvfTJptVfhQtL1AhEAeF1I+buVoJRmBEyYKD9BdU4xQN39VrZKziO3 +hDIGng/eK6PaPhUdq6XqvmnsZ2h+KVbyoj4cTo2gKCB2XA7O2HLQsuGduHzYKNjf +QR9j0djjwTrsvGvzfEzchP19723vYf7GdcLvqtPqzpxSX2FNARpCGXBw9wARAQAB +tDNSZWxlYXNlIEVuZ2luZWVyaW5nIDxpbmZyYXN0cnVjdHVyZUByb2NreWxpbnV4 +Lm9yZz6JAk4EEwEIADgWIQRwUcRwqSn0VM6+N7cVr12sbXRaYAUCYCh/NgIbDwUL +CQgHAgYVCgkICwIEFgIDAQIeAQIXgAAKCRAVr12sbXRaYLFmEACSMvoO1FDdyAbu +1m6xEzDhs7FgnZeQNzLZECv2j+ggFSJXezlNVOZ5I1I8umBan2ywfKQD8M+IjmrW +k9/7h9i54t8RS/RN7KNo7ECGnKXqXDPzBBTs1Gwo1WzltAoaDKUfXqQ4oJ4aCP/q +/XPVWEzgpJO1XEezvCq8VXisutyDiXEjjMIeBczxb1hbamQX+jLTIQ1MDJ4Zo1YP +zlUqrHW434XC2b1/WbSaylq8Wk9cksca5J+g3FqTlgiWozyy0uxygIRjb6iTzKXk +V7SYxeXp3hNTuoUgiFkjh5/0yKWCwx7aQqlHar9GjpxmBDAO0kzOlgtTw//EqTwR +KnYZLig9FW0PhwvZJUigr0cvs/XXTTb77z/i/dfHkrjVTTYenNyXogPtTtSyxqca +61fbPf0B/S3N43PW8URXBRS0sykpX4SxKu+PwKCqf+OJ7hMEVAapqzTt1q9T7zyB +QwvCVx8s7WWvXbs2d6ZUrArklgjHoHQcdxJKdhuRmD34AuXWCLW+gH8rJWZpuNl3 ++WsPZX4PvjKDgMw6YMcV7zhWX6c0SevKtzt7WP3XoKDuPhK1PMGJQqQ7spegGB+5 +DZvsJS48Ip0S45Qfmj82ibXaCBJHTNZE8Zs+rdTjQ9DS5qvzRA1sRA1dBb/7OLYE +JmeWf4VZyebm+gc50szsg6Ut2yT8hw== +=AiP8 +-----END PGP PUBLIC KEY BLOCK----- diff --git a/salt/repo/client/files/rocky/yum.conf.jinja b/salt/repo/client/files/rocky/yum.conf.jinja new file mode 100644 index 000000000..bd31ac007 --- /dev/null +++ b/salt/repo/client/files/rocky/yum.conf.jinja @@ -0,0 +1,17 @@ +{% set proxy = salt['pillar.get']('manager:proxy') -%} +[main] +cachedir=/var/cache/yum/$basearch/$releasever +keepcache=0 +debuglevel=2 +logfile=/var/log/yum.log +exactarch=1 +obsoletes=1 +gpgcheck=1 +plugins=1 +installonly_limit={{ salt['pillar.get']('yum:config:installonly_limit', 2) }} +bugtracker_url=http://bugs.centos.org/set_project.php?project_id=23&ref=http://bugs.centos.org/bug_report_page.php?category=yum +distroverpkg=centos-release +clean_requirements_on_remove=1 +{% if proxy -%} +proxy={{ proxy }} +{% endif %} diff --git a/salt/repo/client/rocky.sls b/salt/repo/client/rocky.sls new file mode 100644 index 000000000..9d522f849 --- /dev/null +++ b/salt/repo/client/rocky.sls @@ -0,0 +1,62 @@ +# Copyright Security Onion Solutions LLC and/or licensed to Security Onion Solutions LLC under one +# or more contributor license agreements. Licensed under the Elastic License 2.0; you may not use +# this file except in compliance with the Elastic License 2.0. + +{% from 'repo/client/map.jinja' import ABSENTFILES with context %} +{% from 'repo/client/map.jinja' import REPOPATH with context %} +{% from 'vars/globals.map.jinja' import GLOBALS %} + +{% set role = grains.id.split('_') | last %} +{% set MANAGER = salt['grains.get']('master') %} +{% if grains['os'] == 'Rocky' %} + +{% if ABSENTFILES|length > 0%} + {% for file in ABSENTFILES %} +{{ file }}: + file.absent: + - name: {{ REPOPATH }}{{ file }} + - onchanges_in: + - cmd: cleanyum + {% endfor %} +{% endif %} + +cleanyum: + cmd.run: + - name: 'yum clean all' + - onchanges: + - so_repo + +yumconf: + file.managed: + - name: /etc/yum.conf + - source: salt://repo/client/files/rocky/yum.conf.jinja + - mode: 644 + - template: jinja + - show_changes: False + +repair_yumdb: + cmd.run: + - name: 'mv -f /var/lib/rpm/__db* /tmp && yum clean all' + - onlyif: + - 'yum check-update 2>&1 | grep "Error: rpmdb open failed"' + +crsynckeys: + file.recurse: + - name: /etc/pki/rpm-gpg + - source: salt://repo/client/files/rocky/keys/ + +so_repo: + pkgrepo.managed: + - name: securityonion + - humanname: Security Onion Repo + {% if GLOBALS.role in ['eval', 'standalone', 'import', 'manager', 'managersearch'] %} + - baseurl: file:///nsm/repo/ + {% else %} + - baseurl: https://{{ GLOBALS.repo_host }}/repo + {% endif %} + - enabled: 1 + - gpgcheck: 1 + +{% endif %} + +# TODO: Add a pillar entry for custom repos From db3a46b6a10320830ece3d0a8eb924dcd8dab661 Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Wed, 22 Feb 2023 10:07:04 -0500 Subject: [PATCH 52/83] fix indent --- salt/repo/client/rocky.sls | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/salt/repo/client/rocky.sls b/salt/repo/client/rocky.sls index 9d522f849..79f56546d 100644 --- a/salt/repo/client/rocky.sls +++ b/salt/repo/client/rocky.sls @@ -52,7 +52,7 @@ so_repo: {% if GLOBALS.role in ['eval', 'standalone', 'import', 'manager', 'managersearch'] %} - baseurl: file:///nsm/repo/ {% else %} - - baseurl: https://{{ GLOBALS.repo_host }}/repo + - baseurl: https://{{ GLOBALS.repo_host }}/repo {% endif %} - enabled: 1 - gpgcheck: 1 From c3784fe548eb53027b2c5d26a95133055372e4e8 Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Wed, 22 Feb 2023 10:09:52 -0500 Subject: [PATCH 53/83] remove grafana --- salt/top.sls | 4 ---- 1 file changed, 4 deletions(-) diff --git a/salt/top.sls b/salt/top.sls index 272e6d8a9..eb42bfbbb 100644 --- a/salt/top.sls +++ b/salt/top.sls @@ -76,7 +76,6 @@ base: - nginx - telegraf - influxdb - - grafana - soc - kratos - firewall @@ -121,7 +120,6 @@ base: - nginx - telegraf - influxdb - - grafana - soc - kratos - firewall @@ -164,7 +162,6 @@ base: - nginx - telegraf - influxdb - - grafana - soc - kratos - firewall @@ -229,7 +226,6 @@ base: - nginx - telegraf - influxdb - - grafana - soc - kratos - firewall From b8966aa33ad205452d1e9622e913fe5573f0559d Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Wed, 22 Feb 2023 10:24:51 -0500 Subject: [PATCH 54/83] fix role match --- salt/repo/client/rocky.sls | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/salt/repo/client/rocky.sls b/salt/repo/client/rocky.sls index 79f56546d..a99d3f422 100644 --- a/salt/repo/client/rocky.sls +++ b/salt/repo/client/rocky.sls @@ -49,7 +49,7 @@ so_repo: pkgrepo.managed: - name: securityonion - humanname: Security Onion Repo - {% if GLOBALS.role in ['eval', 'standalone', 'import', 'manager', 'managersearch'] %} + {% if GLOBALS.role in ['so-eval', 'so-standalone', 'so-import', 'so-manager', 'so-managersearch'] %} - baseurl: file:///nsm/repo/ {% else %} - baseurl: https://{{ GLOBALS.repo_host }}/repo From 6dd09fb2c5e75559e63e3c76cecf962cfd092cfd Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Wed, 22 Feb 2023 10:42:45 -0500 Subject: [PATCH 55/83] remove filebeat --- salt/allowed_states.map.jinja | 6 ------ .../tools/sbin/so-elastic-auth-password-reset | 2 -- salt/common/tools/sbin/so-elastic-clear | 17 ++--------------- salt/common/tools/sbin/so-elastic-restart | 4 ---- salt/common/tools/sbin/so-elastic-start | 4 ---- salt/common/tools/sbin/so-elastic-stop | 4 ---- salt/common/tools/sbin/so-restart | 4 ++-- salt/common/tools/sbin/so-start | 4 ++-- salt/common/tools/sbin/so-stop | 4 ++-- salt/curator/files/bin/so-curator-close | 5 ----- salt/curator/files/bin/so-curator-cluster-close | 5 ----- .../curator/files/bin/so-curator-cluster-delete | 5 ----- salt/curator/files/bin/so-curator-cluster-warm | 5 ----- salt/docker/defaults.yaml | 6 ------ salt/firewall/containers.map.jinja | 5 ----- setup/so-functions | 2 +- setup/so-variables | 8 +------- 17 files changed, 10 insertions(+), 80 deletions(-) diff --git a/salt/allowed_states.map.jinja b/salt/allowed_states.map.jinja index cff5fdcdf..bc2a7c86b 100644 --- a/salt/allowed_states.map.jinja +++ b/salt/allowed_states.map.jinja @@ -8,7 +8,6 @@ {% set PLAYBOOK = salt['pillar.get']('manager:playbook', '0') %} {% set ELASTALERT = salt['pillar.get']('elastalert:enabled', True) %} {% set ELASTICSEARCH = salt['pillar.get']('elasticsearch:enabled', True) %} -{% set FILEBEAT = salt['pillar.get']('filebeat:enabled', True) %} {% set KIBANA = salt['pillar.get']('kibana:enabled', True) %} {% set LOGSTASH = salt['pillar.get']('logstash:enabled', True) %} {% set CURATOR = salt['pillar.get']('curator:enabled', True) %} @@ -188,7 +187,6 @@ 'pcap', 'suricata', 'healthcheck', - 'filebeat', 'schedule', 'tcpreplay', 'docker_clean' @@ -204,10 +202,6 @@ ], }, grain='role') %} - {% if FILEBEAT and grains.role in ['so-helixsensor', 'so-eval', 'so-manager', 'so-standalone', 'so-searchnode', 'so-managersearch', 'so-heavynode', 'so-import', 'so-receiver'] %} - {% do allowed_states.append('filebeat') %} - {% endif %} - {% if (PLAYBOOK != 0) and grains.role in ['so-eval', 'so-manager', 'so-managersearch', 'so-standalone'] %} {% do allowed_states.append('mysql') %} {% endif %} diff --git a/salt/common/tools/sbin/so-elastic-auth-password-reset b/salt/common/tools/sbin/so-elastic-auth-password-reset index 17404e953..5bc5230c3 100755 --- a/salt/common/tools/sbin/so-elastic-auth-password-reset +++ b/salt/common/tools/sbin/so-elastic-auth-password-reset @@ -95,8 +95,6 @@ function soUserSync() { $(dirname $0)/so-user sync printf "\nApplying logstash state to the appropriate nodes.\n\n" salt -C 'G@role:so-standalone or G@role:so-eval or G@role:so-import or G@role:so-manager or G@role:so-managersearch or G@role:so-searchnode or G@role:so-heavynode' state.apply logstash queue=True - printf "\nApplying filebeat state to the appropriate nodes.\n\n" - salt -C 'G@role:so-standalone or G@role:so-eval or G@role:so-import or G@role:so-manager or G@role:so-managersearch or G@role:so-searchnode or G@role:so-heavynode or G@role:so-sensor or G@role:so-fleet' state.apply filebeat queue=True printf "\nApplying kibana state to the appropriate nodes.\n\n" salt -C 'G@role:so-standalone or G@role:so-eval or G@role:so-import or G@role:so-manager or G@role:so-managersearch' state.apply kibana queue=True printf "\nApplying curator state to the appropriate nodes.\n\n" diff --git a/salt/common/tools/sbin/so-elastic-clear b/salt/common/tools/sbin/so-elastic-clear index 08da4021c..fca676172 100755 --- a/salt/common/tools/sbin/so-elastic-clear +++ b/salt/common/tools/sbin/so-elastic-clear @@ -54,17 +54,10 @@ if [ $SKIP -ne 1 ]; then if [ "$INPUT" != "AGREE" ] ; then exit 0; fi fi -# Check to see if Logstash/Filebeat are running +# Check to see if Logstash are running LS_ENABLED=$(so-status | grep logstash) -FB_ENABLED=$(so-status | grep filebeat) EA_ENABLED=$(so-status | grep elastalert) -if [ ! -z "$FB_ENABLED" ]; then - - /usr/sbin/so-filebeat-stop - -fi - if [ ! -z "$LS_ENABLED" ]; then /usr/sbin/so-logstash-stop @@ -86,13 +79,7 @@ do curl -K /opt/so/conf/elasticsearch/curl.config-XDELETE -k -L https://"{{ NODEIP }}:9200/${INDX}" > /dev/null 2>&1 done -#Start Logstash/Filebeat -if [ ! -z "$FB_ENABLED" ]; then - - /usr/sbin/so-filebeat-start - -fi - +#Start Logstash if [ ! -z "$LS_ENABLED" ]; then /usr/sbin/so-logstash-start diff --git a/salt/common/tools/sbin/so-elastic-restart b/salt/common/tools/sbin/so-elastic-restart index 4fb8ae10b..67988193f 100755 --- a/salt/common/tools/sbin/so-elastic-restart +++ b/salt/common/tools/sbin/so-elastic-restart @@ -22,10 +22,6 @@ /usr/sbin/so-restart logstash $1 {%- endif %} -{%- if grains['role'] in ['so-manager', 'so-managersearch', 'so-standalone', 'so-heavynode', 'so-searchnode', 'so-sensor']%} -/usr/sbin/so-restart filebeat $1 -{%- endif %} - {%- if grains['role'] in ['so-manager', 'so-managersearch', 'so-standalone', 'so-heavynode', 'so-searchnode']%} /usr/sbin/so-restart curator $1 {%- endif %} diff --git a/salt/common/tools/sbin/so-elastic-start b/salt/common/tools/sbin/so-elastic-start index 04c076662..fd78d1859 100755 --- a/salt/common/tools/sbin/so-elastic-start +++ b/salt/common/tools/sbin/so-elastic-start @@ -22,10 +22,6 @@ /usr/sbin/so-start logstash $1 {%- endif %} -{%- if grains['role'] in ['so-manager', 'so-managersearch', 'so-standalone', 'so-heavynode', 'so-searchnode', 'so-sensor']%} -/usr/sbin/so-start filebeat $1 -{%- endif %} - {%- if grains['role'] in ['so-manager', 'so-managersearch', 'so-standalone', 'so-heavynode', 'so-searchnode']%} /usr/sbin/so-start curator $1 {%- endif %} diff --git a/salt/common/tools/sbin/so-elastic-stop b/salt/common/tools/sbin/so-elastic-stop index 45e8fd18b..88350a8fe 100755 --- a/salt/common/tools/sbin/so-elastic-stop +++ b/salt/common/tools/sbin/so-elastic-stop @@ -22,10 +22,6 @@ /usr/sbin/so-stop logstash $1 {%- endif %} -{%- if grains['role'] in ['so-manager', 'so-managersearch', 'so-standalone', 'so-heavynode', 'so-searchnode', 'so-sensor']%} -/usr/sbin/so-stop filebeat $1 -{%- endif %} - {%- if grains['role'] in ['so-manager', 'so-managersearch', 'so-standalone', 'so-heavynode', 'so-searchnode']%} /usr/sbin/so-stop curator $1 {%- endif %} diff --git a/salt/common/tools/sbin/so-restart b/salt/common/tools/sbin/so-restart index 3790625f7..dfedf290b 100755 --- a/salt/common/tools/sbin/so-restart +++ b/salt/common/tools/sbin/so-restart @@ -7,7 +7,7 @@ -# Usage: so-restart filebeat | kibana | playbook +# Usage: so-restart kibana | playbook . /usr/sbin/so-common @@ -27,5 +27,5 @@ if [ $# -ge 1 ]; then *) docker stop so-$1 ; docker rm so-$1 ; salt-call state.apply $1 queue=True;; esac else - echo -e "\nPlease provide an argument by running like so-restart $component, or by using the component-specific script.\nEx. so-restart filebeat, or so-filebeat-restart\n" + echo -e "\nPlease provide an argument by running like so-restart $component, or by using the component-specific script.\nEx. so-restart logstash, or so-logstash-restart\n" fi diff --git a/salt/common/tools/sbin/so-start b/salt/common/tools/sbin/so-start index 6e208a6af..fbf3e4300 100755 --- a/salt/common/tools/sbin/so-start +++ b/salt/common/tools/sbin/so-start @@ -7,7 +7,7 @@ -# Usage: so-start all | filebeat | kibana | playbook +# Usage: so-start all | kibana | playbook . /usr/sbin/so-common @@ -27,5 +27,5 @@ if [ $# -ge 1 ]; then *) if docker ps | grep -E -q '^so-$1$'; then printf "\n$1 is already running\n\n"; else docker rm so-$1 >/dev/null 2>&1 ; salt-call state.apply $1 queue=True; fi ;; esac else - echo -e "\nPlease provide an argument by running like so-start $component, or by using the component-specific script.\nEx. so-start filebeat, or so-filebeat-start\n" + echo -e "\nPlease provide an argument by running like so-start $component, or by using the component-specific script.\nEx. so-start logstash, or so-logstash-start\n" fi diff --git a/salt/common/tools/sbin/so-stop b/salt/common/tools/sbin/so-stop index 3538b2fd3..32e24f83a 100755 --- a/salt/common/tools/sbin/so-stop +++ b/salt/common/tools/sbin/so-stop @@ -7,7 +7,7 @@ -# Usage: so-stop filebeat | kibana | playbook | thehive +# Usage: so-stop kibana | playbook | thehive . /usr/sbin/so-common @@ -20,6 +20,6 @@ if [ $# -ge 1 ]; then *) docker stop so-$1 ; docker rm so-$1 ;; esac else - echo -e "\nPlease provide an argument by running like so-stop $component, or by using the component-specific script.\nEx. so-stop filebeat, or so-filebeat-stop\n" + echo -e "\nPlease provide an argument by running like so-stop $component, or by using the component-specific script.\nEx. so-stop logstash, or so-logstash-stop\n" fi diff --git a/salt/curator/files/bin/so-curator-close b/salt/curator/files/bin/so-curator-close index 4d6fbe602..885cb4502 100644 --- a/salt/curator/files/bin/so-curator-close +++ b/salt/curator/files/bin/so-curator-close @@ -13,8 +13,6 @@ read lastPID < $lf [ ! -z "$lastPID" -a -d /proc/$lastPID ] && exit echo $$ > $lf -{% from 'filebeat/modules.map.jinja' import MODULESMERGED with context %} - /usr/sbin/so-curator-closed-delete > /dev/null 2>&1; docker exec so-curator curator --config /etc/curator/config/curator.yml /etc/curator/action/so-zeek-close.yml > /dev/null 2>&1; docker exec so-curator curator --config /etc/curator/config/curator.yml /etc/curator/action/so-beats-close.yml > /dev/null 2>&1; @@ -27,6 +25,3 @@ docker exec so-curator curator --config /etc/curator/config/curator.yml /etc/cur docker exec so-curator curator --config /etc/curator/config/curator.yml /etc/curator/action/so-ossec-close.yml > /dev/null 2>&1; docker exec so-curator curator --config /etc/curator/config/curator.yml /etc/curator/action/so-strelka-close.yml > /dev/null 2>&1; docker exec so-curator curator --config /etc/curator/config/curator.yml /etc/curator/action/so-syslog-close.yml > /dev/null 2>&1; -{% for INDEX in MODULESMERGED.modules.keys() -%} -docker exec so-curator curator --config /etc/curator/config/curator.yml /etc/curator/action/so-{{ INDEX }}-close.yml > /dev/null 2>&1{% if not loop.last %};{% endif %} -{% endfor -%} diff --git a/salt/curator/files/bin/so-curator-cluster-close b/salt/curator/files/bin/so-curator-cluster-close index 95d882619..0929149ed 100644 --- a/salt/curator/files/bin/so-curator-cluster-close +++ b/salt/curator/files/bin/so-curator-cluster-close @@ -13,8 +13,6 @@ read lastPID < $lf [ ! -z "$lastPID" -a -d /proc/$lastPID ] && exit echo $$ > $lf -{% from 'filebeat/modules.map.jinja' import MODULESMERGED with context %} - docker exec so-curator curator --config /etc/curator/config/curator.yml /etc/curator/action/so-zeek-close.yml > /dev/null 2>&1; docker exec so-curator curator --config /etc/curator/config/curator.yml /etc/curator/action/so-beats-close.yml > /dev/null 2>&1; docker exec so-curator curator --config /etc/curator/config/curator.yml /etc/curator/action/so-firewall-close.yml > /dev/null 2>&1; @@ -25,6 +23,3 @@ docker exec so-curator curator --config /etc/curator/config/curator.yml /etc/cur docker exec so-curator curator --config /etc/curator/config/curator.yml /etc/curator/action/so-ossec-close.yml > /dev/null 2>&1; docker exec so-curator curator --config /etc/curator/config/curator.yml /etc/curator/action/so-strelka-close.yml > /dev/null 2>&1; docker exec so-curator curator --config /etc/curator/config/curator.yml /etc/curator/action/so-syslog-close.yml > /dev/null 2>&1; -{% for INDEX in MODULESMERGED.modules.keys() -%} -docker exec so-curator curator --config /etc/curator/config/curator.yml /etc/curator/action/so-{{ INDEX }}-close.yml > /dev/null 2>&1{% if not loop.last %};{% endif %} -{% endfor -%} diff --git a/salt/curator/files/bin/so-curator-cluster-delete b/salt/curator/files/bin/so-curator-cluster-delete index 9ec5129af..2d71f725d 100644 --- a/salt/curator/files/bin/so-curator-cluster-delete +++ b/salt/curator/files/bin/so-curator-cluster-delete @@ -13,8 +13,6 @@ read lastPID < $lf [ ! -z "$lastPID" -a -d /proc/$lastPID ] && exit echo $$ > $lf -{% from 'filebeat/modules.map.jinja' import MODULESMERGED with context %} - docker exec so-curator curator --config /etc/curator/config/curator.yml /etc/curator/action/so-zeek-delete.yml > /dev/null 2>&1; docker exec so-curator curator --config /etc/curator/config/curator.yml /etc/curator/action/so-beats-delete.yml > /dev/null 2>&1; docker exec so-curator curator --config /etc/curator/config/curator.yml /etc/curator/action/so-firewall-delete.yml > /dev/null 2>&1; @@ -25,6 +23,3 @@ docker exec so-curator curator --config /etc/curator/config/curator.yml /etc/cur docker exec so-curator curator --config /etc/curator/config/curator.yml /etc/curator/action/so-ossec-delete.yml > /dev/null 2>&1; docker exec so-curator curator --config /etc/curator/config/curator.yml /etc/curator/action/so-strelka-delete.yml > /dev/null 2>&1; docker exec so-curator curator --config /etc/curator/config/curator.yml /etc/curator/action/so-syslog-delete.yml > /dev/null 2>&1; -{% for INDEX in MODULESMERGED.modules.keys() -%} -docker exec so-curator curator --config /etc/curator/config/curator.yml /etc/curator/action/so-{{ INDEX }}-delete.yml > /dev/null 2>&1{% if not loop.last %};{% endif %} -{% endfor -%} diff --git a/salt/curator/files/bin/so-curator-cluster-warm b/salt/curator/files/bin/so-curator-cluster-warm index 7de6dd391..f868caf0d 100644 --- a/salt/curator/files/bin/so-curator-cluster-warm +++ b/salt/curator/files/bin/so-curator-cluster-warm @@ -14,8 +14,6 @@ read lastPID < $lf [ ! -z "$lastPID" -a -d /proc/$lastPID ] && exit echo $$ > $lf -{% from 'filebeat/modules.map.jinja' import MODULESMERGED with context %} - docker exec so-curator curator --config /etc/curator/config/curator.yml /etc/curator/action/so-zeek-warm.yml > /dev/null 2>&1; docker exec so-curator curator --config /etc/curator/config/curator.yml /etc/curator/action/so-beats-warm.yml > /dev/null 2>&1; docker exec so-curator curator --config /etc/curator/config/curator.yml /etc/curator/action/so-firewall-warm.yml > /dev/null 2>&1; @@ -26,6 +24,3 @@ docker exec so-curator curator --config /etc/curator/config/curator.yml /etc/cur docker exec so-curator curator --config /etc/curator/config/curator.yml /etc/curator/action/so-ossec-warm.yml > /dev/null 2>&1; docker exec so-curator curator --config /etc/curator/config/curator.yml /etc/curator/action/so-strelka-warm.yml > /dev/null 2>&1; docker exec so-curator curator --config /etc/curator/config/curator.yml /etc/curator/action/so-syslog-warm.yml > /dev/null 2>&1; -{% for INDEX in MODULESMERGED.modules.keys() -%} -docker exec so-curator curator --config /etc/curator/config/curator.yml /etc/curator/action/so-{{ INDEX }}-warm.yml > /dev/null 2>&1{% if not loop.last %};{% endif %} -{% endfor -%} diff --git a/salt/docker/defaults.yaml b/salt/docker/defaults.yaml index 30b2c78e1..8ccb7cf2d 100644 --- a/salt/docker/defaults.yaml +++ b/salt/docker/defaults.yaml @@ -17,12 +17,6 @@ docker: port_bindings: - 0.0.0.0:9200:9200/tcp - 0.0.0.0:9300:9300/tcp - 'so-filebeat': - final_octet: 23 - port_bindings: - - 0.0.0.0:514:514/udp - - 0.0.0.0:514:514/tcp - - 0.0.0.0:5066:5066/tcp 'so-idstools': final_octet: 25 'so-influxdb': diff --git a/salt/firewall/containers.map.jinja b/salt/firewall/containers.map.jinja index 70a676e89..f1e93ddea 100644 --- a/salt/firewall/containers.map.jinja +++ b/salt/firewall/containers.map.jinja @@ -32,7 +32,6 @@ 'so-elasticsearch', 'so-elastic-fleet', 'so-elastic-fleet-package-registry', - 'so-filebeat', 'so-influxdb', 'so-kibana', 'so-kratos', @@ -54,7 +53,6 @@ {% if GLOBALS.role == 'so-searchnode' %} {% set NODE_CONTAINERS = [ 'so-elasticsearch', - 'so-filebeat', 'so-logstash', 'so-nginx' ] %} @@ -64,7 +62,6 @@ {% set NODE_CONTAINERS = [ 'so-curator', 'so-elasticsearch', - 'so-filebeat', 'so-logstash', 'so-nginx', 'so-redis', @@ -83,7 +80,6 @@ 'so-elasticsearch', 'so-elastic-fleet', 'so-elastic-fleet-package-registry', - 'so-filebeat', 'so-influxdb', 'so-kibana', 'so-kratos', @@ -94,7 +90,6 @@ {% if GLOBALS.role == 'so-receiver' %} {% set NODE_CONTAINERS = [ - 'so-filebeat', 'so-logstash', 'so-redis', ] %} diff --git a/setup/so-functions b/setup/so-functions index 78b87a113..64248c30f 100755 --- a/setup/so-functions +++ b/setup/so-functions @@ -1544,7 +1544,7 @@ make_some_dirs() { mkdir -p $local_salt_dir/salt/firewall/portgroups mkdir -p $local_salt_dir/salt/firewall/ports - for THEDIR in bpf pcap elasticsearch ntp firewall redis backup influxdb strelka sensoroni curator soc soctopus docker zeek suricata nginx telegraf filebeat logstash soc manager kratos idstools idh elastalert;do + for THEDIR in bpf pcap elasticsearch ntp firewall redis backup influxdb strelka sensoroni curator soc soctopus docker zeek suricata nginx telegraf logstash soc manager kratos idstools idh elastalert;do mkdir -p $local_salt_dir/pillar/$THEDIR touch $local_salt_dir/pillar/$THEDIR/adv_$THEDIR.sls touch $local_salt_dir/pillar/$THEDIR/soc_$THEDIR.sls diff --git a/setup/so-variables b/setup/so-variables index 0caf10ee7..6a3861e92 100644 --- a/setup/so-variables +++ b/setup/so-variables @@ -136,12 +136,6 @@ export suricata_pillar_file adv_suricata_pillar_file="$local_salt_dir/pillar/suricata/adv_suricata.sls" export adv_suricata_pillar_file -filebeat_pillar_file="$local_salt_dir/pillar/filebeat/soc_filebeat.sls" -export filebeat_pillar_file - -adv_filebeat_pillar_file="$local_salt_dir/pillar/filebeat/adv_filebeat.sls" -export adv_filebeat_pillar_file - logstash_pillar_file="$local_salt_dir/pillar/logstash/soc_logstash.sls" export logstash_pillar_file @@ -200,4 +194,4 @@ influxdb_pillar_file="$local_salt_dir/pillar/influxdb/soc_influxdb.sls" export influxdb_pillar_file adv_influxdb_pillar_file="$local_salt_dir/pillar/influxdb/adv_influxdb.sls" -export adv_influxdb_pillar_file \ No newline at end of file +export adv_influxdb_pillar_file From 7c64dad95bdabfe3be1287a0fc14c12342c1087a Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Wed, 22 Feb 2023 11:28:46 -0500 Subject: [PATCH 56/83] add mysql --- salt/mysql/init.sls | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/salt/mysql/init.sls b/salt/mysql/init.sls index 7287eb00d..7f8c9f347 100644 --- a/salt/mysql/init.sls +++ b/salt/mysql/init.sls @@ -21,7 +21,7 @@ mysqlpkgs: - python3-mysqldb {% endif %} {% else %} - - MySQL-python + - python3-mysqlclient {% endif %} mysqletcdir: From 3deb6197379cf72e0526fb0505193b4ecbcc6a78 Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Wed, 22 Feb 2023 12:58:39 -0500 Subject: [PATCH 57/83] add watchdog --- salt/common/packages.sls | 1 + 1 file changed, 1 insertion(+) diff --git a/salt/common/packages.sls b/salt/common/packages.sls index d91e1b714..e5e75c47a 100644 --- a/salt/common/packages.sls +++ b/salt/common/packages.sls @@ -51,4 +51,5 @@ commonpkgs: - python3-m2crypto - rsync - python3-rich + - python3-watchdog {% endif %} From c20a7e6cf949a122eb87f6e3c9cbd589415ea74e Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Wed, 22 Feb 2023 13:48:40 -0500 Subject: [PATCH 58/83] fix yaml --- salt/strelka/filecheck/filecheck | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/salt/strelka/filecheck/filecheck b/salt/strelka/filecheck/filecheck index ea7186793..758248083 100644 --- a/salt/strelka/filecheck/filecheck +++ b/salt/strelka/filecheck/filecheck @@ -15,7 +15,7 @@ from watchdog.observers import Observer from watchdog.events import FileSystemEventHandler with open("/opt/so/conf/strelka/filecheck.yaml", "r") as ymlfile: - cfg = yaml.load(ymlfile) + cfg = yaml.load(ymlfile, Loader=yaml.Loader) extract_path = cfg["filecheck"]["extract_path"] historypath = cfg["filecheck"]["historypath"] From c6a46d1eb34e7fe52f192dd9e425ae0e17d3e4e8 Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Wed, 22 Feb 2023 14:14:27 -0500 Subject: [PATCH 59/83] change playbook to use hostname --- salt/mysql/init.sls | 2 +- salt/playbook/init.sls | 16 +++++++++------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/salt/mysql/init.sls b/salt/mysql/init.sls index 7f8c9f347..d6a910f32 100644 --- a/salt/mysql/init.sls +++ b/salt/mysql/init.sls @@ -105,7 +105,7 @@ so-mysql: - file: mysqlcnf - file: mysqlpass cmd.run: - - name: until nc -z {{ GLOBALS.manager_ip }} 3306; do sleep 1; done + - name: until nc -z {{ GLOBALS.manager }} 3306; do sleep 1; done - timeout: 600 - onchanges: - docker_container: so-mysql diff --git a/salt/playbook/init.sls b/salt/playbook/init.sls index 1b75935f1..5e3285914 100644 --- a/salt/playbook/init.sls +++ b/salt/playbook/init.sls @@ -19,7 +19,7 @@ create_playbookdbuser: - name: playbookdbuser - password: {{ PLAYBOOKPASS }} - host: "{{ DOCKER.sorange.split('/')[0] }}/255.255.255.0" - - connection_host: {{ GLOBALS.manager_ip }} + - connection_host: {{ GLOBALS.manager }} - connection_port: 3306 - connection_user: root - connection_pass: {{ MYSQLPASS }} @@ -28,7 +28,7 @@ query_playbookdbuser_grants: mysql_query.run: - database: playbook - query: "GRANT ALL ON playbook.* TO 'playbookdbuser'@'{{ DOCKER.sorange.split('/')[0] }}/255.255.255.0';" - - connection_host: {{ GLOBALS.manager_ip }} + - connection_host: {{ GLOBALS.manager }} - connection_port: 3306 - connection_user: root - connection_pass: {{ MYSQLPASS }} @@ -36,7 +36,7 @@ query_playbookdbuser_grants: query_updatwebhooks: mysql_query.run: - database: playbook - - query: "update webhooks set url = 'http://{{ GLOBALS.manager_ip }}:7000/playbook/webhook' where project_id = 1" + - query: "update webhooks set url = 'http://{{ GLOBALS.manager}}:7000/playbook/webhook' where project_id = 1" - connection_host: {{ GLOBALS.manager_ip }} - connection_port: 3306 - connection_user: root @@ -49,10 +49,10 @@ query_updatepluginurls: update settings set value = "--- !ruby/hash:ActiveSupport::HashWithIndifferentAccess project: '1' - convert_url: http://{{ GLOBALS.manager_ip }}:7000/playbook/sigmac - create_url: http://{{ GLOBALS.manager_ip }}:7000/playbook/play" + convert_url: http://{{ GLOBALS.manager }}:7000/playbook/sigmac + create_url: http://{{ GLOBALS.manager }}:7000/playbook/play" where id = 43 - - connection_host: {{ GLOBALS.manager_ip }} + - connection_host: {{ GLOBALS.manager }} - connection_port: 3306 - connection_user: root - connection_pass: {{ MYSQLPASS }} @@ -85,8 +85,10 @@ so-playbook: - ipv4_address: {{ DOCKER.containers['so-playbook'].ip }} - binds: - /opt/so/log/playbook:/playbook/log:rw + - extra_hosts: + - {{ GLOBALS.manager }}:{{ GLOBALS.manager_ip }} - environment: - - REDMINE_DB_MYSQL={{ GLOBALS.manager_ip }} + - REDMINE_DB_MYSQL={{ GLOBALS.manager }} - REDMINE_DB_DATABASE=playbook - REDMINE_DB_USERNAME=playbookdbuser - REDMINE_DB_PASSWORD={{ PLAYBOOKPASS }} From 59c700ad1012ce934534c9ea2346c7b164415bdc Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Wed, 22 Feb 2023 14:15:10 -0500 Subject: [PATCH 60/83] change playbook to use hostname --- salt/playbook/automation_user_create.sls | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/salt/playbook/automation_user_create.sls b/salt/playbook/automation_user_create.sls index 61662677f..dd4620c95 100644 --- a/salt/playbook/automation_user_create.sls +++ b/salt/playbook/automation_user_create.sls @@ -7,7 +7,7 @@ include: wait_for_playbook: cmd.run: - - name: until nc -z {{ GLOBALS.manager_ip }} 3200; do sleep 1; done + - name: until nc -z {{ GLOBALS.manager }} 3200; do sleep 1; done - timeout: 300 create_user: From 68708accde95c73e4319b134a38f9f28cbdf2d9a Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Wed, 22 Feb 2023 14:32:49 -0500 Subject: [PATCH 61/83] change playbook to use hostname --- salt/mysql/init.sls | 2 ++ salt/playbook/init.sls | 4 ++-- salt/vars/globals.map.jinja | 1 + 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/salt/mysql/init.sls b/salt/mysql/init.sls index d6a910f32..e6107c494 100644 --- a/salt/mysql/init.sls +++ b/salt/mysql/init.sls @@ -91,6 +91,8 @@ so-mysql: {% for BINDING in DOCKER.containers['so-mysql'].port_bindings %} - {{ BINDING }} {% endfor %} + - extra_hosts: + - {{ GLOBALS.manager }}:{{ GLOBALS.sobip }} - environment: - MYSQL_ROOT_HOST={{ GLOBALS.manager_ip }} - MYSQL_ROOT_PASSWORD=/etc/mypass diff --git a/salt/playbook/init.sls b/salt/playbook/init.sls index 5e3285914..5fe9ab92f 100644 --- a/salt/playbook/init.sls +++ b/salt/playbook/init.sls @@ -36,8 +36,8 @@ query_playbookdbuser_grants: query_updatwebhooks: mysql_query.run: - database: playbook - - query: "update webhooks set url = 'http://{{ GLOBALS.manager}}:7000/playbook/webhook' where project_id = 1" - - connection_host: {{ GLOBALS.manager_ip }} + - query: "update webhooks set url = 'http://{{ GLOBALS.manager_ip}}:7000/playbook/webhook' where project_id = 1" + - connection_host: {{ GLOBALS.manager }} - connection_port: 3306 - connection_user: root - connection_pass: {{ MYSQLPASS }} diff --git a/salt/vars/globals.map.jinja b/salt/vars/globals.map.jinja index b2f5af552..52951c7d6 100644 --- a/salt/vars/globals.map.jinja +++ b/salt/vars/globals.map.jinja @@ -21,6 +21,7 @@ 'md_engine': INIT.PILLAR.global.mdengine, 'pipeline': INIT.PILLAR.global.pipeline, 'so_version': INIT.PILLAR.global.soversion, + 'so_bip': INIT.PILLAR.docker.sobip, 'url_base': INIT.PILLAR.global.url_base, 'so_model': INIT.GRAINS.get('sosmodel',''), 'description': INIT.PILLAR.sensoroni.get('node_description',''), From bf8e6c64d633af38be456a54b7319fa0f14e6f2c Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Wed, 22 Feb 2023 14:41:14 -0500 Subject: [PATCH 62/83] add sobip to global vars --- salt/mysql/init.sls | 2 +- salt/vars/globals.map.jinja | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/salt/mysql/init.sls b/salt/mysql/init.sls index e6107c494..378b72a24 100644 --- a/salt/mysql/init.sls +++ b/salt/mysql/init.sls @@ -92,7 +92,7 @@ so-mysql: - {{ BINDING }} {% endfor %} - extra_hosts: - - {{ GLOBALS.manager }}:{{ GLOBALS.sobip }} + - {{ GLOBALS.manager }}:{{ GLOBALS.so_docker_bip }} - environment: - MYSQL_ROOT_HOST={{ GLOBALS.manager_ip }} - MYSQL_ROOT_PASSWORD=/etc/mypass diff --git a/salt/vars/globals.map.jinja b/salt/vars/globals.map.jinja index 52951c7d6..6460e8957 100644 --- a/salt/vars/globals.map.jinja +++ b/salt/vars/globals.map.jinja @@ -1,4 +1,5 @@ {% import 'vars/init.map.jinja' as INIT %} +{% from 'docker/docker.map.jinja' import DOCKER %} {% from 'vars/' ~ INIT.GRAINS.role.split('-')[1] ~ '.map.jinja' import ROLE_GLOBALS %} {# role is so-role so we have to split off the 'so' #} @@ -21,7 +22,8 @@ 'md_engine': INIT.PILLAR.global.mdengine, 'pipeline': INIT.PILLAR.global.pipeline, 'so_version': INIT.PILLAR.global.soversion, - 'so_bip': INIT.PILLAR.docker.sobip, + 'so_docker_bip': DOCKER.sobip, + 'so_docker_range': DOCKER.sorange, 'url_base': INIT.PILLAR.global.url_base, 'so_model': INIT.GRAINS.get('sosmodel',''), 'description': INIT.PILLAR.sensoroni.get('node_description',''), From 1c1e613351eafd2ef66eb85a170c91aaa0db9945 Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Wed, 22 Feb 2023 14:48:55 -0500 Subject: [PATCH 63/83] change playbook to use hostname --- salt/mysql/init.sls | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/salt/mysql/init.sls b/salt/mysql/init.sls index 378b72a24..30e39aa86 100644 --- a/salt/mysql/init.sls +++ b/salt/mysql/init.sls @@ -94,7 +94,7 @@ so-mysql: - extra_hosts: - {{ GLOBALS.manager }}:{{ GLOBALS.so_docker_bip }} - environment: - - MYSQL_ROOT_HOST={{ GLOBALS.manager_ip }} + - MYSQL_ROOT_HOST={{ GLOBALS.manager }} - MYSQL_ROOT_PASSWORD=/etc/mypass - binds: - /opt/so/conf/mysql/etc/my.cnf:/etc/my.cnf:ro From 417fff924d04c7371d164c71a25d944899169c41 Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Wed, 22 Feb 2023 14:53:02 -0500 Subject: [PATCH 64/83] change playbook to use hostname --- salt/mysql/init.sls | 6 ++---- salt/playbook/init.sls | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/salt/mysql/init.sls b/salt/mysql/init.sls index 30e39aa86..ba78476dc 100644 --- a/salt/mysql/init.sls +++ b/salt/mysql/init.sls @@ -91,10 +91,8 @@ so-mysql: {% for BINDING in DOCKER.containers['so-mysql'].port_bindings %} - {{ BINDING }} {% endfor %} - - extra_hosts: - - {{ GLOBALS.manager }}:{{ GLOBALS.so_docker_bip }} - environment: - - MYSQL_ROOT_HOST={{ GLOBALS.manager }} + - MYSQL_ROOT_HOST={{ GLOBALS.so_docker_bip }} - MYSQL_ROOT_PASSWORD=/etc/mypass - binds: - /opt/so/conf/mysql/etc/my.cnf:/etc/my.cnf:ro @@ -107,7 +105,7 @@ so-mysql: - file: mysqlcnf - file: mysqlpass cmd.run: - - name: until nc -z {{ GLOBALS.manager }} 3306; do sleep 1; done + - name: until nc -z {{ GLOBALS.so_docker_bip }} 3306; do sleep 1; done - timeout: 600 - onchanges: - docker_container: so-mysql diff --git a/salt/playbook/init.sls b/salt/playbook/init.sls index 5fe9ab92f..f2a9d4614 100644 --- a/salt/playbook/init.sls +++ b/salt/playbook/init.sls @@ -86,7 +86,7 @@ so-playbook: - binds: - /opt/so/log/playbook:/playbook/log:rw - extra_hosts: - - {{ GLOBALS.manager }}:{{ GLOBALS.manager_ip }} + - {{ GLOBALS.manager }}:{{ GLOBALS.so_docker_bip }} - environment: - REDMINE_DB_MYSQL={{ GLOBALS.manager }} - REDMINE_DB_DATABASE=playbook From 6e59cc3409c4747fe01e0e0a0b6a501c0f0702fa Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Wed, 22 Feb 2023 14:56:53 -0500 Subject: [PATCH 65/83] change playbook to use hostname --- salt/playbook/init.sls | 2 -- 1 file changed, 2 deletions(-) diff --git a/salt/playbook/init.sls b/salt/playbook/init.sls index f2a9d4614..c36bef933 100644 --- a/salt/playbook/init.sls +++ b/salt/playbook/init.sls @@ -85,8 +85,6 @@ so-playbook: - ipv4_address: {{ DOCKER.containers['so-playbook'].ip }} - binds: - /opt/so/log/playbook:/playbook/log:rw - - extra_hosts: - - {{ GLOBALS.manager }}:{{ GLOBALS.so_docker_bip }} - environment: - REDMINE_DB_MYSQL={{ GLOBALS.manager }} - REDMINE_DB_DATABASE=playbook From 45434b06a446d1d03d85ad2ae6626b785675be92 Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Wed, 22 Feb 2023 15:08:56 -0500 Subject: [PATCH 66/83] change playbook to use hostname --- salt/playbook/init.sls | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/salt/playbook/init.sls b/salt/playbook/init.sls index c36bef933..7a644811c 100644 --- a/salt/playbook/init.sls +++ b/salt/playbook/init.sls @@ -86,7 +86,7 @@ so-playbook: - binds: - /opt/so/log/playbook:/playbook/log:rw - environment: - - REDMINE_DB_MYSQL={{ GLOBALS.manager }} + - REDMINE_DB_MYSQL={{ GLOBALS.manager_ip }} - REDMINE_DB_DATABASE=playbook - REDMINE_DB_USERNAME=playbookdbuser - REDMINE_DB_PASSWORD={{ PLAYBOOKPASS }} From 5bc1dc9567a8f45b9282c76cf3c5d1d9377ff874 Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Wed, 22 Feb 2023 15:19:27 -0500 Subject: [PATCH 67/83] change playbook to use hostname --- salt/playbook/init.sls | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/salt/playbook/init.sls b/salt/playbook/init.sls index 7a644811c..8afd3d70b 100644 --- a/salt/playbook/init.sls +++ b/salt/playbook/init.sls @@ -86,7 +86,7 @@ so-playbook: - binds: - /opt/so/log/playbook:/playbook/log:rw - environment: - - REDMINE_DB_MYSQL={{ GLOBALS.manager_ip }} + - REDMINE_DB_MYSQL={{ DOCKER.containers['so-mysql'].ip }} - REDMINE_DB_DATABASE=playbook - REDMINE_DB_USERNAME=playbookdbuser - REDMINE_DB_PASSWORD={{ PLAYBOOKPASS }} From 0d0a61bd4a56a60cb4c63a6f80c16dcc2f7e125e Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Wed, 22 Feb 2023 15:29:30 -0500 Subject: [PATCH 68/83] remove so-grafana from node containers --- salt/firewall/containers.map.jinja | 1 - 1 file changed, 1 deletion(-) diff --git a/salt/firewall/containers.map.jinja b/salt/firewall/containers.map.jinja index f1e93ddea..bd4cf72f1 100644 --- a/salt/firewall/containers.map.jinja +++ b/salt/firewall/containers.map.jinja @@ -7,7 +7,6 @@ 'so-elasticsearch', 'so-elastic-fleet', 'so-elastic-fleet-package-registry', - 'so-grafana', 'so-influxdb', 'so-kibana', 'so-kratos', From 8e834079745cbaada5c16bc03087a4cd90541e92 Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Wed, 22 Feb 2023 16:24:35 -0500 Subject: [PATCH 69/83] change playbook to use hostname --- salt/firewall/iptables.jinja | 7 +++++++ salt/kibana/config.map.jinja | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/salt/firewall/iptables.jinja b/salt/firewall/iptables.jinja index 8aea5ed36..ec2a5ae65 100644 --- a/salt/firewall/iptables.jinja +++ b/salt/firewall/iptables.jinja @@ -91,7 +91,9 @@ COMMIT {%- endfor %} -A INPUT -m conntrack --ctstate RELATED,ESTABLISHED -j ACCEPT +-A INPUT -i lo -j ACCEPT -A INPUT -m conntrack --ctstate INVALID -j DROP +-A INPUT -j REJECT --reject-with icmp-host-prohibited -A INPUT -p icmp -j ACCEPT -A INPUT -j LOGGING -A FORWARD -j DOCKER-USER @@ -100,6 +102,11 @@ COMMIT -A FORWARD -o sobridge -j DOCKER -A FORWARD -i sobridge ! -o sobridge -j ACCEPT -A FORWARD -i sobridge -o sobridge -j ACCEPT +-A FORWARD -m conntrack --ctstate RELATED,ESTABLISHED -j ACCEPT +-A FORWARD -i lo -j ACCEPT +-A FORWARD -m conntrack --ctstate INVALID -j DROP +-A FORWARD -j REJECT --reject-with icmp-host-prohibited +-A OUTPUT -o lo -j ACCEPT -A OUTPUT -p icmp -m icmp --icmp-type 14 -j DROP {%- for rule in D2 %} diff --git a/salt/kibana/config.map.jinja b/salt/kibana/config.map.jinja index 9e75f1726..9b460e86f 100644 --- a/salt/kibana/config.map.jinja +++ b/salt/kibana/config.map.jinja @@ -3,7 +3,7 @@ {% set HIGHLANDER = salt['pillar.get']('global:highlander', False) %} {% do KIBANACONFIG.kibana.config.server.update({'publicBaseUrl': 'https://' ~ GLOBALS.url_base ~ '/kibana'}) %} -{% do KIBANACONFIG.kibana.config.elasticsearch.update({'hosts': ['https://' ~ GLOBALS.manager_ip ~ ':9200']}) %} +{% do KIBANACONFIG.kibana.config.elasticsearch.update({'hosts': ['https://' ~ GLOBALS.manager ~ ':9200']}) %} {% do KIBANACONFIG.kibana.config.elasticsearch.update({'username': salt['pillar.get']('elasticsearch:auth:users:so_kibana_user:user'), 'password': salt['pillar.get']('elasticsearch:auth:users:so_kibana_user:pass')}) %} From 0ec0983d7bfd7318d2325cc482f5f38721f3a3e0 Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Thu, 23 Feb 2023 08:57:30 -0500 Subject: [PATCH 70/83] Chane Elastalert to use hosntame --- salt/elastalert/elastalert_config.map.jinja | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/salt/elastalert/elastalert_config.map.jinja b/salt/elastalert/elastalert_config.map.jinja index 15f9c8530..26ddc08c9 100644 --- a/salt/elastalert/elastalert_config.map.jinja +++ b/salt/elastalert/elastalert_config.map.jinja @@ -3,7 +3,7 @@ {% set elastalert_pillar = salt['pillar.get']('elastalert:config', {}) %} -{% do ELASTALERT.elastalert.config.update({'es_host': GLOBALS.manager_ip}) %} +{% do ELASTALERT.elastalert.config.update({'es_host': GLOBALS.manager}) %} {% do ELASTALERT.elastalert.config.update({'es_username': pillar.elasticsearch.auth.users.so_elastic_user.user}) %} {% do ELASTALERT.elastalert.config.update({'es_password': pillar.elasticsearch.auth.users.so_elastic_user.pass}) %} From 7b30064d869517a287067653e03e2791da7f2abc Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Thu, 23 Feb 2023 09:10:20 -0500 Subject: [PATCH 71/83] Chane Elastalert to use hosntame --- salt/kibana/init.sls | 2 ++ 1 file changed, 2 insertions(+) diff --git a/salt/kibana/init.sls b/salt/kibana/init.sls index 19682e105..676b26d5a 100644 --- a/salt/kibana/init.sls +++ b/salt/kibana/init.sls @@ -89,6 +89,8 @@ so-kibana: - ELASTICSEARCH_HOST={{ GLOBALS.manager }} - ELASTICSEARCH_PORT=9200 - MANAGER={{ GLOBALS.manager }} + - extra_hosts: + - {{ GLOBALS.manager }}:{{ GLOBALS.so_docker_bip }} - binds: - /opt/so/conf/kibana/etc:/usr/share/kibana/config:rw - /opt/so/log/kibana:/var/log/kibana:rw From 4db404b6f54ee57dcc82162a5151074f162a94a6 Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Thu, 23 Feb 2023 09:21:19 -0500 Subject: [PATCH 72/83] remove jinja from kibana defaults --- salt/kibana/defaults.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/salt/kibana/defaults.yaml b/salt/kibana/defaults.yaml index 159465508..64a5646e5 100644 --- a/salt/kibana/defaults.yaml +++ b/salt/kibana/defaults.yaml @@ -5,7 +5,6 @@ kibana: name: kibana host: "0.0.0.0" basePath: /kibana - publicBaseUrl: https://{{salt['pillar.get']('global:url_base')}}/kibana rewriteBasePath: false elasticsearch: ssl: From 6927e28def10d426f4197ba46360ab027bb49627 Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Thu, 23 Feb 2023 09:25:16 -0500 Subject: [PATCH 73/83] Change kibana IP --- salt/kibana/init.sls | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/salt/kibana/init.sls b/salt/kibana/init.sls index 676b26d5a..bb5a52048 100644 --- a/salt/kibana/init.sls +++ b/salt/kibana/init.sls @@ -90,7 +90,7 @@ so-kibana: - ELASTICSEARCH_PORT=9200 - MANAGER={{ GLOBALS.manager }} - extra_hosts: - - {{ GLOBALS.manager }}:{{ GLOBALS.so_docker_bip }} + - {{ GLOBALS.manager }}:{{ DOCKER.containers['so-elasticsearch'].ip }} - binds: - /opt/so/conf/kibana/etc:/usr/share/kibana/config:rw - /opt/so/log/kibana:/var/log/kibana:rw From dc2fed5b047c2256ce6bbda9c69d60e071956ab1 Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Thu, 23 Feb 2023 09:34:16 -0500 Subject: [PATCH 74/83] Change elastalert ip --- salt/elastalert/init.sls | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/salt/elastalert/init.sls b/salt/elastalert/init.sls index 37d749223..b57b5c17a 100644 --- a/salt/elastalert/init.sls +++ b/salt/elastalert/init.sls @@ -97,7 +97,7 @@ so-elastalert: - /opt/so/conf/elastalert/modules/:/opt/elastalert/modules/:ro - /opt/so/conf/elastalert/elastalert_config.yaml:/opt/elastalert/config.yaml:ro - extra_hosts: - - {{GLOBALS.url_base}}:{{GLOBALS.manager_ip}} + - {{GLOBALS.url_base}}:{{ DOCKER.containers['so-elasticsearch'].ip }} - require: - cmd: wait_for_elasticsearch - file: elastarules From 95f254dc6388fd4f44996a35eb793ee6c19902e3 Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Thu, 23 Feb 2023 09:37:20 -0500 Subject: [PATCH 75/83] Change elastalert ip --- salt/elastalert/init.sls | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/salt/elastalert/init.sls b/salt/elastalert/init.sls index b57b5c17a..607193e1c 100644 --- a/salt/elastalert/init.sls +++ b/salt/elastalert/init.sls @@ -97,7 +97,7 @@ so-elastalert: - /opt/so/conf/elastalert/modules/:/opt/elastalert/modules/:ro - /opt/so/conf/elastalert/elastalert_config.yaml:/opt/elastalert/config.yaml:ro - extra_hosts: - - {{GLOBALS.url_base}}:{{ DOCKER.containers['so-elasticsearch'].ip }} + - {{ GLOBALS.manager }}:{{ DOCKER.containers['so-elasticsearch'].ip }} - require: - cmd: wait_for_elasticsearch - file: elastarules From 3fed04a5322e0c536d35da8ea09d2d39e77e980d Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Thu, 23 Feb 2023 09:52:24 -0500 Subject: [PATCH 76/83] fix nginx config --- salt/nginx/etc/nginx.conf | 34 ++++++++++------------------------ 1 file changed, 10 insertions(+), 24 deletions(-) diff --git a/salt/nginx/etc/nginx.conf b/salt/nginx/etc/nginx.conf index 1dc73d030..54d0a466c 100644 --- a/salt/nginx/etc/nginx.conf +++ b/salt/nginx/etc/nginx.conf @@ -1,6 +1,6 @@ {%- from 'vars/globals.map.jinja' import GLOBALS %} +{%- from 'docker/docker.map.jinja' import DOCKER %} {%- set role = grains.id.split('_') | last %} - {%- set influxpass = salt['pillar.get']('secrets:influx_pass') %} {%- set influxauth = ('so:' + influxpass) | base64_encode %} @@ -98,7 +98,7 @@ http { ssl_protocols TLSv1.2; location ~* (^/login/.*|^/js/.*|^/css/.*|^/images/.*) { - proxy_pass http://{{ GLOBALS.manager_ip }}:9822; + proxy_pass http://{{ DOCKER.containers['so-soc'].ip }}:9822; proxy_read_timeout 90; proxy_connect_timeout 90; proxy_set_header x-user-id ""; @@ -115,7 +115,7 @@ http { auth_request /auth/sessions/whoami; auth_request_set $userid $upstream_http_x_kratos_authenticated_identity_id; proxy_set_header x-user-id $userid; - proxy_pass http://{{ GLOBALS.manager_ip }}:9822/; + proxy_pass http://{{ DOCKER.containers['so-soc'].ip }}:9822/; proxy_read_timeout 300; proxy_connect_timeout 300; proxy_set_header Host $host; @@ -129,7 +129,7 @@ http { location ~ ^/auth/.*?(whoami|login|logout|settings) { rewrite /auth/(.*) /$1 break; - proxy_pass http://{{ GLOBALS.manager_ip }}:4433; + proxy_pass http://{{ DOCKER.containers['so-kratos'].ip }}:4433; proxy_read_timeout 90; proxy_connect_timeout 90; proxy_set_header Host $host; @@ -186,7 +186,7 @@ http { location /influxdb/ { auth_request /auth/sessions/whoami; rewrite /influxdb/api/(.*) /api/$1 break; - proxy_pass https://{{ GLOBALS.manager_ip }}:8086/; + proxy_pass https://{{ DOCKER.containers['so-influxdb'].ip }}:8086/; proxy_read_timeout 300; proxy_connect_timeout 90; proxy_set_header Host $host; @@ -200,7 +200,7 @@ http { location /kibana/ { auth_request /auth/sessions/whoami; rewrite /kibana/(.*) /$1 break; - proxy_pass http://{{ GLOBALS.manager_ip }}:5601/; + proxy_pass http://{{ DOCKER.containers['so-kibana'].ip }}:5601/; proxy_read_timeout 300; proxy_connect_timeout 300; proxy_set_header Host $host; @@ -209,24 +209,10 @@ http { proxy_set_header Proxy ""; proxy_set_header X-Forwarded-Proto $scheme; } - - location /nodered/ { - auth_request /auth/sessions/whoami; - proxy_pass http://{{ GLOBALS.manager_ip }}:1880/; - proxy_read_timeout 90; - proxy_connect_timeout 90; - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection "Upgrade"; - proxy_set_header Proxy ""; - proxy_set_header X-Forwarded-Proto $scheme; - } - + location /playbook/ { auth_request /auth/sessions/whoami; - proxy_pass http://{{ GLOBALS.manager_ip }}:3200/playbook/; + proxy_pass http://{{ DOCKER.containers['so-playbook'].ip }}:3000/playbook/; proxy_read_timeout 90; proxy_connect_timeout 90; proxy_set_header Host $host; @@ -239,7 +225,7 @@ http { location /soctopus/ { auth_request /auth/sessions/whoami; - proxy_pass http://{{ GLOBALS.manager_ip }}:7000/; + proxy_pass http://{{ DOCKER.containers['so-soctopus'].ip }}:7000/; proxy_read_timeout 300; proxy_connect_timeout 300; proxy_set_header Host $host; @@ -261,7 +247,7 @@ http { if ($http_authorization = "") { return 403; } - proxy_pass http://{{ GLOBALS.manager_ip }}:9822/; + proxy_pass http://{{ DOCKER.containers['so-soc'].ip }}:9822/; proxy_read_timeout 90; proxy_connect_timeout 90; proxy_set_header x-user-id ""; From 7f2d2630467d2850d0572c270c2196e1548fcbfa Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Thu, 23 Feb 2023 10:16:34 -0500 Subject: [PATCH 77/83] fix nginx config --- salt/vars/globals.map.jinja | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/salt/vars/globals.map.jinja b/salt/vars/globals.map.jinja index 6460e8957..578432799 100644 --- a/salt/vars/globals.map.jinja +++ b/salt/vars/globals.map.jinja @@ -50,9 +50,9 @@ {% do GLOBALS.update({ 'application_urls': { - 'kratos': 'http://' ~ GLOBALS.manager_ip ~ ':4434/', - 'elastic': 'https://' ~ GLOBALS.manager_ip ~ ':9200/', - 'influxdb': 'https://' ~ GLOBALS.manager_ip ~ ':8086/' + 'kratos': 'http://' ~ GLOBALS.manager ~ ':4434/', + 'elastic': 'https://' ~ GLOBALS.manager ~ ':9200/', + 'influxdb': 'https://' ~ GLOBALS.manager ~ ':8086/' } }) %} From 96b1fb4782bee9ee67f9ac7fc81c2839cd33bb5c Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Thu, 23 Feb 2023 10:51:03 -0500 Subject: [PATCH 78/83] change to eval --- salt/firewall/assigned_hostgroups.map.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/salt/firewall/assigned_hostgroups.map.yaml b/salt/firewall/assigned_hostgroups.map.yaml index c018559fe..0f748e6d6 100644 --- a/salt/firewall/assigned_hostgroups.map.yaml +++ b/salt/firewall/assigned_hostgroups.map.yaml @@ -9,7 +9,7 @@ role: chain: DOCKER-USER: hostgroups: - manager: + eval: portgroups: - {{ portgroups.playbook }} - {{ portgroups.mysql }} From 399e4de73c62e743f56ca5269d8de7305121b2aa Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Thu, 23 Feb 2023 11:04:23 -0500 Subject: [PATCH 79/83] stop and disable firewalld --- salt/firewall/init.sls | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/salt/firewall/init.sls b/salt/firewall/init.sls index de22703f3..12aaed39e 100644 --- a/salt/firewall/init.sls +++ b/salt/firewall/init.sls @@ -1,6 +1,11 @@ {% from 'allowed_states.map.jinja' import allowed_states %} {% if sls in allowed_states %} +disable_firewalld: + service.dead: + - name: firewalld + - enable: False + create_sysconfig_iptables: file.touch: - name: /etc/sysconfig/iptables From 148b0b1c4c2358559628e1962953b526fe043133 Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Thu, 23 Feb 2023 11:11:29 -0500 Subject: [PATCH 80/83] use hostnames please --- salt/elastalert/init.sls | 2 +- salt/elastic-fleet/init.sls | 6 +++++- salt/nginx/etc/nginx.conf | 16 ++++++++-------- salt/soc/init.sls | 1 - 4 files changed, 14 insertions(+), 11 deletions(-) diff --git a/salt/elastalert/init.sls b/salt/elastalert/init.sls index 607193e1c..b04fe1147 100644 --- a/salt/elastalert/init.sls +++ b/salt/elastalert/init.sls @@ -97,7 +97,7 @@ so-elastalert: - /opt/so/conf/elastalert/modules/:/opt/elastalert/modules/:ro - /opt/so/conf/elastalert/elastalert_config.yaml:/opt/elastalert/config.yaml:ro - extra_hosts: - - {{ GLOBALS.manager }}:{{ DOCKER.containers['so-elasticsearch'].ip }} + - {{ GLOBALS.manager }}:{{ GLOBALS.manager_ip }} - require: - cmd: wait_for_elasticsearch - file: elastarules diff --git a/salt/elastic-fleet/init.sls b/salt/elastic-fleet/init.sls index be9bac96e..4218eca67 100644 --- a/salt/elastic-fleet/init.sls +++ b/salt/elastic-fleet/init.sls @@ -52,7 +52,11 @@ so-elastic-fleet: - sobridge: - ipv4_address: {{ DOCKER.containers['so-elastic-fleet'].ip }} - extra_hosts: + {% if GLOBALS.is_manager %} + - {{ GLOBALS.manager }}:{{ GLOBALS.manager_ip }} + {% else %} - {{ GLOBALS.hostname }}:{{ GLOBALS.node_ip }} + {% endif %} - port_bindings: {% for BINDING in DOCKER.containers['so-elastic-fleet'].port_bindings %} - {{ BINDING }} @@ -63,7 +67,7 @@ so-elastic-fleet: - environment: - FLEET_SERVER_ENABLE=true - FLEET_URL=https://{{ FLEETURL }}:8220 - - FLEET_SERVER_ELASTICSEARCH_HOST=https://{{ GLOBALS.manager_ip }}:9200 + - FLEET_SERVER_ELASTICSEARCH_HOST=https://{{ GLOBALS.manager }}:9200 - FLEET_SERVER_SERVICE_TOKEN={{ SERVICETOKEN }} - FLEET_SERVER_POLICY_ID={{ FLEETSERVERPOLICY }} - FLEET_SERVER_ELASTICSEARCH_CA=/etc/pki/intca.crt diff --git a/salt/nginx/etc/nginx.conf b/salt/nginx/etc/nginx.conf index 54d0a466c..e6a7f3c87 100644 --- a/salt/nginx/etc/nginx.conf +++ b/salt/nginx/etc/nginx.conf @@ -98,7 +98,7 @@ http { ssl_protocols TLSv1.2; location ~* (^/login/.*|^/js/.*|^/css/.*|^/images/.*) { - proxy_pass http://{{ DOCKER.containers['so-soc'].ip }}:9822; + proxy_pass http://{{ GLOBALS.manager }}:9822; proxy_read_timeout 90; proxy_connect_timeout 90; proxy_set_header x-user-id ""; @@ -115,7 +115,7 @@ http { auth_request /auth/sessions/whoami; auth_request_set $userid $upstream_http_x_kratos_authenticated_identity_id; proxy_set_header x-user-id $userid; - proxy_pass http://{{ DOCKER.containers['so-soc'].ip }}:9822/; + proxy_pass http://{{ GLOBALS.manager }}:9822/; proxy_read_timeout 300; proxy_connect_timeout 300; proxy_set_header Host $host; @@ -129,7 +129,7 @@ http { location ~ ^/auth/.*?(whoami|login|logout|settings) { rewrite /auth/(.*) /$1 break; - proxy_pass http://{{ DOCKER.containers['so-kratos'].ip }}:4433; + proxy_pass http://{{ GLOBALS.manager }}:4433; proxy_read_timeout 90; proxy_connect_timeout 90; proxy_set_header Host $host; @@ -186,7 +186,7 @@ http { location /influxdb/ { auth_request /auth/sessions/whoami; rewrite /influxdb/api/(.*) /api/$1 break; - proxy_pass https://{{ DOCKER.containers['so-influxdb'].ip }}:8086/; + proxy_pass https://{{ GLOBALS.manager }}:8086/; proxy_read_timeout 300; proxy_connect_timeout 90; proxy_set_header Host $host; @@ -200,7 +200,7 @@ http { location /kibana/ { auth_request /auth/sessions/whoami; rewrite /kibana/(.*) /$1 break; - proxy_pass http://{{ DOCKER.containers['so-kibana'].ip }}:5601/; + proxy_pass http://{{ GLOBALS.manager }}:5601/; proxy_read_timeout 300; proxy_connect_timeout 300; proxy_set_header Host $host; @@ -212,7 +212,7 @@ http { location /playbook/ { auth_request /auth/sessions/whoami; - proxy_pass http://{{ DOCKER.containers['so-playbook'].ip }}:3000/playbook/; + proxy_pass http://{{ GLOBALS.manager }}:3000/playbook/; proxy_read_timeout 90; proxy_connect_timeout 90; proxy_set_header Host $host; @@ -225,7 +225,7 @@ http { location /soctopus/ { auth_request /auth/sessions/whoami; - proxy_pass http://{{ DOCKER.containers['so-soctopus'].ip }}:7000/; + proxy_pass http://{{ GLOBALS.manager }}:7000/; proxy_read_timeout 300; proxy_connect_timeout 300; proxy_set_header Host $host; @@ -247,7 +247,7 @@ http { if ($http_authorization = "") { return 403; } - proxy_pass http://{{ DOCKER.containers['so-soc'].ip }}:9822/; + proxy_pass http://{{ GLOBALS.manager }}:9822/; proxy_read_timeout 90; proxy_connect_timeout 90; proxy_set_header x-user-id ""; diff --git a/salt/soc/init.sls b/salt/soc/init.sls index 502b47136..9905a104a 100644 --- a/salt/soc/init.sls +++ b/salt/soc/init.sls @@ -111,7 +111,6 @@ so-soc: - /opt/so/conf/soc/salt:/opt/sensoroni/salt:rw - /opt/so/saltstack:/opt/so/saltstack:rw - extra_hosts: - - {{GLOBALS.influxdb_host}}:{{pillar.node_data[GLOBALS.influxdb_host].ip}} {%- if salt['pillar.get']('nodestab', {}) %} {%- for SN, SNDATA in salt['pillar.get']('nodestab', {}).items() %} - {{ SN.split('_')|first }}:{{ SNDATA.ip }} From 4896452245a90f56edce055f8c543e5952d1d28d Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Thu, 23 Feb 2023 11:13:54 -0500 Subject: [PATCH 81/83] use hostnames please --- salt/kibana/init.sls | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/salt/kibana/init.sls b/salt/kibana/init.sls index bb5a52048..a974dcf48 100644 --- a/salt/kibana/init.sls +++ b/salt/kibana/init.sls @@ -90,7 +90,7 @@ so-kibana: - ELASTICSEARCH_PORT=9200 - MANAGER={{ GLOBALS.manager }} - extra_hosts: - - {{ GLOBALS.manager }}:{{ DOCKER.containers['so-elasticsearch'].ip }} + - {{ GLOBALS.manager }}:{{ GLOBALS.manager_ip }} - binds: - /opt/so/conf/kibana/etc:/usr/share/kibana/config:rw - /opt/so/log/kibana:/var/log/kibana:rw From 2ebd9b359884f4c0df9e0c6878fd313fb69f1105 Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Thu, 23 Feb 2023 11:19:13 -0500 Subject: [PATCH 82/83] use hostnames please --- salt/nginx/init.sls | 2 ++ 1 file changed, 2 insertions(+) diff --git a/salt/nginx/init.sls b/salt/nginx/init.sls index d6839814f..e3a13c2f2 100644 --- a/salt/nginx/init.sls +++ b/salt/nginx/init.sls @@ -88,6 +88,8 @@ so-nginx: - networks: - sobridge: - ipv4_address: {{ DOCKER.containers['so-nginx'].ip }} + - extra_hosts: + - {{ GLOBALS.manager }}:{{ GLOBALS.manager_ip }} - binds: - /opt/so/conf/nginx/nginx.conf:/etc/nginx/nginx.conf:ro - /opt/so/log/nginx/:/var/log/nginx:rw From 8f46e4aa30a9925de08edf9017609d272db0872d Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Thu, 23 Feb 2023 12:26:48 -0500 Subject: [PATCH 83/83] set docker extra_hosts for soc --- salt/soc/init.sls | 8 ++------ salt/soc/merged.map.jinja | 4 ++++ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/salt/soc/init.sls b/salt/soc/init.sls index 9905a104a..e2ec511ed 100644 --- a/salt/soc/init.sls +++ b/salt/soc/init.sls @@ -3,6 +3,7 @@ {% from 'vars/globals.map.jinja' import GLOBALS %} {% from 'docker/docker.map.jinja' import DOCKER %} +{% from 'soc/merged.map.jinja' import DOCKER_EXTRA_HOSTS %} include: - manager.sync_es_users @@ -110,12 +111,7 @@ so-soc: - /opt/so/conf/soc/soc_users_roles:/opt/sensoroni/rbac/users_roles:rw - /opt/so/conf/soc/salt:/opt/sensoroni/salt:rw - /opt/so/saltstack:/opt/so/saltstack:rw - - extra_hosts: - {%- if salt['pillar.get']('nodestab', {}) %} - {%- for SN, SNDATA in salt['pillar.get']('nodestab', {}).items() %} - - {{ SN.split('_')|first }}:{{ SNDATA.ip }} - {%- endfor %} - {%- endif %} + - extra_hosts: {{ DOCKER_EXTRA_HOSTS }} - port_bindings: {% for BINDING in DOCKER.containers['so-soc'].port_bindings %} - {{ BINDING }} diff --git a/salt/soc/merged.map.jinja b/salt/soc/merged.map.jinja index 4ae7ce38e..97d228ebd 100644 --- a/salt/soc/merged.map.jinja +++ b/salt/soc/merged.map.jinja @@ -1,5 +1,9 @@ {% from 'vars/globals.map.jinja' import GLOBALS %} {% from 'soc/defaults.map.jinja' import SOCDEFAULTS with context %} +{% from 'logstash/map.jinja' import LOGSTASH_NODES %} +{% set DOCKER_EXTRA_HOSTS = LOGSTASH_NODES %} +{% do DOCKER_EXTRA_HOSTS.append({GLOBALS.influxdb_host:pillar.node_data[GLOBALS.influxdb_host].ip}) %} + {% set SOCMERGED = salt['pillar.get']('soc', SOCDEFAULTS, merge=true) %} {# if SOCMERGED.server.modules.cases == httpcase details come from the soc pillar #}