From f80c8b89e45abd52a0262f7c48d295ebbb765c40 Mon Sep 17 00:00:00 2001 From: lock-wire Date: Mon, 21 Nov 2022 09:49:31 -0700 Subject: [PATCH] Shorten Log Descriptions --- salt/common/tools/sbin/so-zeek-logs | 110 ++++++++++++++-------------- setup/so-whiptail | 104 +++++++++++++------------- 2 files changed, 107 insertions(+), 107 deletions(-) diff --git a/salt/common/tools/sbin/so-zeek-logs b/salt/common/tools/sbin/so-zeek-logs index e4c8c7d7a..f65617b10 100755 --- a/salt/common/tools/sbin/so-zeek-logs +++ b/salt/common/tools/sbin/so-zeek-logs @@ -11,7 +11,7 @@ zeek_logs_enabled() { whiptail_manager_adv_service_zeeklogs() { BLOGS=$(whiptail --title "so-zeek-logs" --checklist "Please Select Logs to Send:" 24 78 12 \ - "conn" "Connection Logging" ON \ + "conn" "Connection Logs" ON \ "dce_rpc" "RPC Logs" ON \ "dhcp" "DHCP Logs" ON \ "dnp3" "DNP3 Logs" ON \ @@ -44,67 +44,67 @@ whiptail_manager_adv_service_zeeklogs() { "socks" "SOCKS Logs" ON \ "x509" "x.509 Logs" ON \ "modbus_detailed" "MODBUS Details" ON \ - "modbus_mask_write_register" "MODBUS Write Register" ON \ - "modbus_read_write_multiple_registers" "MODBUS Multi Registers" ON \ - "dnp3_objects" "DNP3 Objections" ON \ + "modbus_mask_write_register" "MODBUS Ext" ON \ + "modbus_read_write_multiple_registers" "MODBUS Ext" ON \ + "dnp3_objects" "DNP3 Objects" ON \ "bacnet" "BACnet" ON \ - "bacnet_discovery" "BACnet Discovery" ON \ - "bacnet_property" "BACnet Property" ON \ - "bsap_ip_header" "BSAP IP Header" ON \ - "bsap_ip_rdb" "BSAP IP RDB" ON \ - "bsap_ip_unknown" "BSAP IP Unknown" ON \ - "bsap_serial_header" "BSAP Serial Header" ON \ - "bsap_serial_rdb" "BSAP Serial RDB" ON \ - "bsap_serial_rdb_ext" "BSAP Serial RDB Extenstion" ON \ - "bsap_serial_unknown" "BSAP Serial Unknown" ON \ - "ecat_registers" "Ethercat Registers" ON \ - "ecat_log_address" "Ethercat Address Read Write" ON \ - "ecat_dev_info" "Ethercat Device Info" ON \ - "ecat_aoe_info" "Ethercat AoE Info" ON \ - "ecat_coe_info" "Ethercat CoE Info" ON \ - "ecat_foe_info" "Ethercat FoE Info" ON \ - "ecat_soe_info" "Ethercat SoE Info" ON \ - "ecat_arp_info" "Ethercat ARP Info" ON \ - "enip" "ENIP Header" ON \ - "cip" "CIP Header" ON \ + "bacnet_discovery" "BACnet" ON \ + "bacnet_property" "BACnet" ON \ + "bsap_ip_header" "BSAP IP" ON \ + "bsap_ip_rdb" "BSAP IP" ON \ + "bsap_ip_unknown" "BSAP IP" ON \ + "bsap_serial_header" "BSAP Serial" ON \ + "bsap_serial_rdb" "BSAP Serial" ON \ + "bsap_serial_rdb_ext" "BSAP Serial" ON \ + "bsap_serial_unknown" "BSAP Serial" ON \ + "ecat_registers" "Ethercat" ON \ + "ecat_log_address" "Ethercat" ON \ + "ecat_dev_info" "Ethercat" ON \ + "ecat_aoe_info" "Ethercat" ON \ + "ecat_coe_info" "Ethercat" ON \ + "ecat_foe_info" "Ethercat" ON \ + "ecat_soe_info" "Ethercat" ON \ + "ecat_arp_info" "Ethercat" ON \ + "enip" "ENIP" ON \ + "cip" "CIP" ON \ "cip_io" "CIP I/O" ON \ "cip_identity" "CIP Identity" ON \ - "opcua_binary.log" "OPC UA Binary Encoding" ON \ - "opcua_binary_status_code_detail" "OPC UA Detail" ON \ - "opcua_binary_diag_info_detail" "OPC UA Diag" ON \ - "opcua_binary_get_endpoints" "OPC UA Endpoints" ON \ - "opcua_binary_get_endpoints_discovery" "OPC UA Endpoints" ON \ - "opcua_binary_get_endpoints_user_token" "OPC UA Endpoints" ON \ - "opcua_binary_get_endpoints_description" "OPC UA Endpoints" ON \ - "opcua_binary_get_endpoints_locale_id" "OPC UA Endpoints" ON \ - "opcua_binary_get_endpoints_profile_uri" "OPC UA Endpoints" ON \ - "opcua_binary_create_session" "OPC UA Session" ON \ - "opcua_binary_create_session_user_token" "OPC UA Session" ON \ - "opcua_binary_create_session_endpoints" "OPC UA Session" ON \ - "opcua_binary_create_session_discovery" "OPC UA Session" ON \ - "opcua_binary_activate_session" "OPC UA Session" ON \ - "opcua_binary_activate_session_client_software_cert" "OPC UA Session" ON \ - "opcua_binary_activate_session_locale_id" "OPC UA Session" ON \ - "opcua_binary_activate_session_diagnostic_info" "OPC UA Session" ON \ - "opcua_binary_browse" "OPC UA Browse" ON \ - "opcua_binary_browse_description" "OPC UA Browse" ON \ - "opcua_binary_browse_request_continuation_point" "OPC UA Browse" ON \ - "opcua_binary_browse_result" "OPC UA Browse" ON \ - "opcua_binary_browse_response_references" "OPC UA Browse" ON \ - "opcua_binary_browse_diagnostic_info" "OPC UA Browse" ON \ - "opcua_binary_create_subscription" "OPC UA UA Browse" ON \ - "opcua_binary_read" "OPC UA Read" ON \ + "opcua_binary.log" "OPC UA" ON \ + "opcua_binary_status_code_detail" "OPC UA" ON \ + "opcua_binary_diag_info_detail" "OPC UA" ON \ + "opcua_binary_get_endpoints" "OPC UA" ON \ + "opcua_binary_get_endpoints_discovery" "OPC UA" ON \ + "opcua_binary_get_endpoints_user_token" "OPC UA" ON \ + "opcua_binary_get_endpoints_description" "OPC UA" ON \ + "opcua_binary_get_endpoints_locale_id" "OPC UA" ON \ + "opcua_binary_get_endpoints_profile_uri" "OPC UA" ON \ + "opcua_binary_create_session" "OPC UA" ON \ + "opcua_binary_create_session_user_token" "OPC UA" ON \ + "opcua_binary_create_session_endpoints" "OPC UA" ON \ + "opcua_binary_create_session_discovery" "OPC UA" ON \ + "opcua_binary_activate_session" "OPC UA" ON \ + "opcua_binary_activate_session_client_software_cert" "OPC UA" ON \ + "opcua_binary_activate_session_locale_id" "OPC UA" ON \ + "opcua_binary_activate_session_diagnostic_info" "OPC UA" ON \ + "opcua_binary_browse" "OPC UA" ON \ + "opcua_binary_browse_description" "OPC UA" ON \ + "opcua_binary_browse_request_continuation_point" "OPC UA" ON \ + "opcua_binary_browse_result" "OPC UA" ON \ + "opcua_binary_browse_response_references" "OPC UA" ON \ + "opcua_binary_browse_diagnostic_info" "OPC UA" ON \ + "opcua_binary_create_subscription" "OPC UA" ON \ + "opcua_binary_read" "OPC UA" ON \ "cotp" "COTP" ON \ - "s7comm" "S7COMM Header" ON \ - "s7comm_read_szl" "S7COMM Read-SZL" ON \ - "s7comm_upload_download" "S7COMM Upoad Download" ON \ - "s7comm_plus" "S7COMM Plus" ON \ - "tds" "Tabular Data Streams" ON \ + "s7comm" "S7COMM" ON \ + "s7comm_read_szl" "S7COMM" ON \ + "s7comm_upload_download" "S7COMM" ON \ + "s7comm_plus" "S7COMM" ON \ + "tds" "TDS" ON \ "tds_rpc" "TDS RPC" ON \ "tds_sql_batch" "TDS SQL" ON \ "profinet" "Profinet" ON \ - "profinet_dce_rpc" "Profinet DCE RPC" ON \ - "profinet_debug" "Profinet Debug" ON \ + "profinet_dce_rpc" "Profinet" ON \ + "profinet_debug" "Profinet" ON \ "stun" "STUN" ON \ "stun_nat" "STUN NAT" ON \ "wireguard" "Wireguard" ON 3>&1 1>&2 2>&3 ) diff --git a/setup/so-whiptail b/setup/so-whiptail index db7345227..e13e9a697 100755 --- a/setup/so-whiptail +++ b/setup/so-whiptail @@ -1281,7 +1281,7 @@ whiptail_manager_adv_service_zeeklogs() { [ -n "$TESTING" ] && return BLOGS=$(whiptail --title "$whiptail_title" --checklist "Please select logs to send:" 24 75 12 \ - "conn" "Connection Logging" ON \ + "conn" "Connection Logs" ON \ "dce_rpc" "RPC Logs" ON \ "dhcp" "DHCP Logs" ON \ "dnp3" "DNP3 Logs" ON \ @@ -1314,67 +1314,67 @@ whiptail_manager_adv_service_zeeklogs() { "socks" "SOCKS Logs" ON \ "x509" "x.509 Logs" ON \ "modbus_detailed" "MODBUS Details" ON \ - "modbus_mask_write_register" "MODBUS Write Register" ON \ - "modbus_read_write_multiple_registers" "MODBUS Multi Registers" ON \ - "dnp3_objects" "DNP3 Objections" ON \ + "modbus_mask_write_register" "MODBUS Ext" ON \ + "modbus_read_write_multiple_registers" "MODBUS Ext" ON \ + "dnp3_objects" "DNP3 Objects" ON \ "bacnet" "BACnet" ON \ - "bacnet_discovery" "BACnet Discovery" ON \ - "bacnet_property" "BACnet Property" ON \ - "bsap_ip_header" "BSAP IP Header" ON \ - "bsap_ip_rdb" "BSAP IP RDB" ON \ - "bsap_ip_unknown" "BSAP IP Unknown" ON \ - "bsap_serial_header" "BSAP Serial Header" ON \ - "bsap_serial_rdb" "BSAP Serial RDB" ON \ - "bsap_serial_rdb_ext" "BSAP Serial RDB Extenstion" ON \ - "bsap_serial_unknown" "BSAP Serial Unknown" ON \ - "ecat_registers" "Ethercat Registers" ON \ - "ecat_log_address" "Ethercat Address Read Write" ON \ - "ecat_dev_info" "Ethercat Device Info" ON \ - "ecat_aoe_info" "Ethercat AoE Info" ON \ - "ecat_coe_info" "Ethercat CoE Info" ON \ - "ecat_foe_info" "Ethercat FoE Info" ON \ - "ecat_soe_info" "Ethercat SoE Info" ON \ - "ecat_arp_info" "Ethercat ARP Info" ON \ + "bacnet_discovery" "BACnet" ON \ + "bacnet_property" "BACnet" ON \ + "bsap_ip_header" "BSAP IP" ON \ + "bsap_ip_rdb" "BSAP IP" ON \ + "bsap_ip_unknown" "BSAP IP" ON \ + "bsap_serial_header" "BSAP Serial" ON \ + "bsap_serial_rdb" "BSAP Serial" ON \ + "bsap_serial_rdb_ext" "BSAP Serial" ON \ + "bsap_serial_unknown" "BSAP Serial" ON \ + "ecat_registers" "Ethercat" ON \ + "ecat_log_address" "Ethercat" ON \ + "ecat_dev_info" "Ethercat" ON \ + "ecat_aoe_info" "Ethercat" ON \ + "ecat_coe_info" "Ethercat" ON \ + "ecat_foe_info" "Ethercat" ON \ + "ecat_soe_info" "Ethercat" ON \ + "ecat_arp_info" "Ethercat" ON \ "enip" "ENIP Header" ON \ "cip" "CIP Header" ON \ "cip_io" "CIP I/O" ON \ "cip_identity" "CIP Identity" ON \ - "opcua_binary" "OPC UA Binary Encoding" ON \ - "opcua_binary_status_code_detail" "OPC UA Detail" ON \ - "opcua_binary_diag_info_detail" "OPC UA Diag" ON \ - "opcua_binary_get_endpoints" "OPC UA Endpoints" ON \ - "opcua_binary_get_endpoints_discovery" "OPC UA Endpoints" ON \ - "opcua_binary_get_endpoints_user_token" "OPC UA Endpoints" ON \ - "opcua_binary_get_endpoints_description" "OPC UA Endpoints" ON \ - "opcua_binary_get_endpoints_locale_id" "OPC UA Endpoints" ON \ - "opcua_binary_get_endpoints_profile_uri" "OPC UA Endpoints" ON \ - "opcua_binary_create_session" "OPC UA Session" ON \ - "opcua_binary_create_session_user_token" "OPC UA Session" ON \ - "opcua_binary_create_session_endpoints" "OPC UA Session" ON \ - "opcua_binary_create_session_discovery" "OPC UA Session" ON \ - "opcua_binary_activate_session" "OPC UA Session" ON \ - "opcua_binary_activate_session_client_software_cert" "OPC UA Session" ON \ - "opcua_binary_activate_session_locale_id" "OPC UA Session" ON \ - "opcua_binary_activate_session_diagnostic_info" "OPC UA Session" ON \ - "opcua_binary_browse" "OPC UA Browse" ON \ - "opcua_binary_browse_description" "OPC UA Browse" ON \ - "opcua_binary_browse_request_continuation_point" "OPC UA Browse" ON \ - "opcua_binary_browse_result" "OPC UA Browse" ON \ - "opcua_binary_browse_response_references" "OPC UA Browse" ON \ - "opcua_binary_browse_diagnostic_info" "OPC UA Browse" ON \ - "opcua_binary_create_subscription" "OPC UA UA Browse" ON \ + "opcua_binary" "OPC UA" ON \ + "opcua_binary_status_code_detail" "OPC UA" ON \ + "opcua_binary_diag_info_detail" "OPC UA" ON \ + "opcua_binary_get_endpoints" "OPC UA" ON \ + "opcua_binary_get_endpoints_discovery" "OPC UA" ON \ + "opcua_binary_get_endpoints_user_token" "OPC UA" ON \ + "opcua_binary_get_endpoints_description" "OPC UA" ON \ + "opcua_binary_get_endpoints_locale_id" "OPC UA" ON \ + "opcua_binary_get_endpoints_profile_uri" "OPC UA" ON \ + "opcua_binary_create_session" "OPC UA" ON \ + "opcua_binary_create_session_user_token" "OPC UA" ON \ + "opcua_binary_create_session_endpoints" "OPC UA" ON \ + "opcua_binary_create_session_discovery" "OPC UA" ON \ + "opcua_binary_activate_session" "OPC UA" ON \ + "opcua_binary_activate_session_client_software_cert" "OPC UA" ON \ + "opcua_binary_activate_session_locale_id" "OPC UA" ON \ + "opcua_binary_activate_session_diagnostic_info" "OPC UA" ON \ + "opcua_binary_browse" "OPC UA" ON \ + "opcua_binary_browse_description" "OPC UA" ON \ + "opcua_binary_browse_request_continuation_point" "OPC UA" ON \ + "opcua_binary_browse_result" "OPC UA" ON \ + "opcua_binary_browse_response_references" "OPC UA" ON \ + "opcua_binary_browse_diagnostic_info" "OPC UA" ON \ + "opcua_binary_create_subscription" "OPC UA" ON \ "opcua_binary_read" "OPC UA Read" ON \ "cotp" "COTP" ON \ - "s7comm" "S7COMM Header" ON \ - "s7comm_read_szl" "S7COMM Read-SZL" ON \ - "s7comm_upload_download" "S7COMM Upoad Download" ON \ - "s7comm_plus" "S7COMM Plus" ON \ - "tds" "Tabular Data Streams" ON \ + "s7comm" "S7COMM" ON \ + "s7comm_read_szl" "S7COMM" ON \ + "s7comm_upload_download" "S7COMM" ON \ + "s7comm_plus" "S7COMM" ON \ + "tds" "TDS" ON \ "tds_rpc" "TDS RPC" ON \ "tds_sql_batch" "TDS SQL" ON \ "profinet" "Profinet" ON \ - "profinet_dce_rpc" "Profinet DCE RPC" ON \ - "profinet_debug" "Profinet Debug" ON \ + "profinet_dce_rpc" "Profinet" ON \ + "profinet_debug" "Profinet" ON \ "stun" "STUN" ON \ "stun_nat" "STUN NAT" ON \ "wireguard" "Wireguard" ON 3>&1 1>&2 2>&3)