diff --git a/README.md b/README.md index b425ee490..1cff4b355 100644 --- a/README.md +++ b/README.md @@ -57,7 +57,7 @@ - Fixed an issue where geoip was not properly parsed. - ATT&CK Navigator is now it's own state. - Standlone mode is now supported. -- Mastersearch previously used the same Grafana dashboard as a Search node. It now has its own dashboard that incorporates panels from the Master node and Search node dashboards. +- Managersearch previously used the same Grafana dashboard as a Search node. It now has its own dashboard that incorporates panels from the Manager node and Search node dashboards. ### Known Issues: diff --git a/salt/common/tools/sbin/so-elastalert-create b/salt/common/tools/sbin/so-elastalert-create index 0270503bf..683b53ed1 100755 --- a/salt/common/tools/sbin/so-elastalert-create +++ b/salt/common/tools/sbin/so-elastalert-create @@ -198,7 +198,7 @@ EOF read alertoption if [ $alertoption = "1" ] ; then - echo "Please enter the email address you want to send the alerts to. Note: Ensure the Master Server is configured for SMTP." + echo "Please enter the email address you want to send the alerts to. Note: Ensure the Manager Server is configured for SMTP." read emailaddress cat << EOF >> "$rulename.yaml" # (Required) diff --git a/salt/grafana/dashboards/manager/manager.json b/salt/grafana/dashboards/manager/manager.json index d1b2bf899..bf2580d34 100644 --- a/salt/grafana/dashboards/manager/manager.json +++ b/salt/grafana/dashboards/manager/manager.json @@ -12,7 +12,7 @@ } ] }, - "description": "This Dashboard provides a general overview of the Master", + "description": "This Dashboard provides a general overview of the Manager", "editable": true, "gnetId": 2381, "graphTooltip": 0, @@ -4162,7 +4162,7 @@ ] }, "timezone": "browser", - "title": "Master Node - {{ SERVERNAME }} Overview", + "title": "Manager Node - {{ SERVERNAME }} Overview", "uid": "{{ UID }}", "version": 3 } \ No newline at end of file diff --git a/salt/grafana/dashboards/managersearch/managersearch.json b/salt/grafana/dashboards/managersearch/managersearch.json index 5ed9f9617..485509477 100644 --- a/salt/grafana/dashboards/managersearch/managersearch.json +++ b/salt/grafana/dashboards/managersearch/managersearch.json @@ -13,7 +13,7 @@ } ] }, - "description": "This Dashboard provides a general overview of a MasterSearch Node", + "description": "This Dashboard provides a general overview of a ManagerSearch Node", "editable": true, "gnetId": 2381, "graphTooltip": 0, diff --git a/salt/grafana/etc/dashboards/dashboard.yml b/salt/grafana/etc/dashboards/dashboard.yml index e08484044..72f77f845 100644 --- a/salt/grafana/etc/dashboards/dashboard.yml +++ b/salt/grafana/etc/dashboards/dashboard.yml @@ -3,15 +3,15 @@ apiVersion: 1 providers: {%- if grains['role'] != 'so-eval' %} -- name: 'Master' - folder: 'Master' +- name: 'Manager' + folder: 'Manager' type: file disableDeletion: false editable: true options: path: /etc/grafana/grafana_dashboards/manager -- name: 'Master Search' - folder: 'Master Search' +- name: 'Manager Search' + folder: 'Manager Search' type: file disableDeletion: false editable: true diff --git a/salt/grafana/init.sls b/salt/grafana/init.sls index c47381c26..247a9215b 100644 --- a/salt/grafana/init.sls +++ b/salt/grafana/init.sls @@ -82,7 +82,7 @@ grafanaconf: {% set SN = SN | regex_replace('_' ~ NODETYPE, '') %} dashboard-manager: file.managed: - - name: /opt/so/conf/grafana/grafana_dashboards/manager/{{ SN }}-Master.json + - name: /opt/so/conf/grafana/grafana_dashboards/manager/{{ SN }}-Manager.json - user: 939 - group: 939 - template: jinja @@ -105,7 +105,7 @@ dashboard-manager: {% set SN = SN | regex_replace('_' ~ NODETYPE, '') %} dashboard-managersearch: file.managed: - - name: /opt/so/conf/grafana/grafana_dashboards/managersearch/{{ SN }}-MasterSearch.json + - name: /opt/so/conf/grafana/grafana_dashboards/managersearch/{{ SN }}-ManagerSearch.json - user: 939 - group: 939 - template: jinja diff --git a/salt/kibana/bin/so-kibana-config-load b/salt/kibana/bin/so-kibana-config-load index 85ad00bc6..f59d0c10d 100644 --- a/salt/kibana/bin/so-kibana-config-load +++ b/salt/kibana/bin/so-kibana-config-load @@ -13,7 +13,7 @@ cp /opt/so/conf/kibana/saved_objects.ndjson.template /opt/so/conf/kibana/saved_o sed -i "s/FLEETPLACEHOLDER/{{ MANAGER }}/g" /opt/so/conf/kibana/saved_objects.ndjson # {% endif %} -# SOCtopus and Master +# SOCtopus and Manager sed -i "s/PLACEHOLDER/{{ MANAGER }}/g" /opt/so/conf/kibana/saved_objects.ndjson # Load saved objects diff --git a/setup/so-functions b/setup/so-functions index 7741b4181..4fe573244 100755 --- a/setup/so-functions +++ b/setup/so-functions @@ -50,7 +50,7 @@ add_manager_hostfile() { echo "Checking if I can resolve manager. If not add to hosts file" >> "$setup_log" 2>&1 # Pop up an input to get the IP address MSRVIP=$(whiptail --title "Security Onion Setup" --inputbox \ - "Enter your Master Server IP Address" 10 60 X.X.X.X 3>&1 1>&2 2>&3) + "Enter your Manager Server IP Address" 10 60 X.X.X.X 3>&1 1>&2 2>&3) local exitstatus=$? whiptail_check_exitstatus $exitstatus diff --git a/setup/so-whiptail b/setup/so-whiptail index 12fdecf99..97181e94a 100755 --- a/setup/so-whiptail +++ b/setup/so-whiptail @@ -422,7 +422,7 @@ whiptail_homenet_sensor() { [ -n "$TESTING" ] && return # Ask to inherit from manager - whiptail --title "Security Onion Setup" --yesno "Do you want to inherit the HOME_NET from the Master?" 8 75 + whiptail --title "Security Onion Setup" --yesno "Do you want to inherit the HOME_NET from the Manager?" 8 75 local exitstatus=$? @@ -462,7 +462,7 @@ whiptail_install_type() { "MANAGER" "Start a new grid " ON \ "SENSOR" "Create a forward only sensor " OFF \ "SEARCHNODE" "Add a search node with parsing " OFF \ - "MANAGERSEARCH" "Master + search node " OFF \ + "MANAGERSEARCH" "Manager + search node " OFF \ "FLEET" "Dedicated Fleet Osquery Node " OFF \ "HEAVYNODE" "Sensor + Search Node " OFF \ 3>&1 1>&2 2>&3 @@ -600,7 +600,7 @@ whiptail_management_server() { [ -n "$TESTING" ] && return MSRV=$(whiptail --title "Security Onion Setup" --inputbox \ - "Enter your Master Server hostname. It is CASE SENSITIVE!" 10 75 XXXX 3>&1 1>&2 2>&3) + "Enter your Manager Server hostname. It is CASE SENSITIVE!" 10 75 XXXX 3>&1 1>&2 2>&3) local exitstatus=$? whiptail_check_exitstatus $exitstatus @@ -611,7 +611,7 @@ whiptail_management_server() { } -# Ask if you want to do advanced setup of the Master +# Ask if you want to do advanced setup of the Manager whiptail_manager_adv() { [ -n "$TESTING" ] && return @@ -1105,7 +1105,7 @@ whiptail_manager_updates() { local update_string update_string=$(whiptail --title "Security Onion Setup" --radiolist \ "How would you like to download OS package updates for your grid?:" 20 75 4 \ - "MANAGER" "Master node is proxy for updates." ON \ + "MANAGER" "Manager node is proxy for updates." ON \ "OPEN" "Each node connects to the Internet for updates" OFF 3>&1 1>&2 2>&3 ) local exitstatus=$? whiptail_check_exitstatus $exitstatus @@ -1138,7 +1138,7 @@ whiptail_node_updates() { NODEUPDATES=$(whiptail --title "Security Onion Setup" --radiolist \ "How would you like to download OS package updates for your grid?:" 20 75 4 \ - "MANAGER" "Master node is proxy for updates." ON \ + "MANAGER" "Manager node is proxy for updates." ON \ "OPEN" "Each node connects to the Internet for updates" OFF 3>&1 1>&2 2>&3 ) local exitstatus=$?