Remove remote_syslog BE code

nimrod-becker · nimrod-becker · commit 9c0e41fb166b · 2019-06-27T16:14:05.000+03:00
diff --git a/frontend/src/app/components/admin/audit-pane/categories.js b/frontend/src/app/components/admin/audit-pane/categories.js
@@ -351,11 +351,6 @@ export default {
                 entityId: () => ''
             },
 
-            remote_syslog: {
-                message: 'Remote Syslog Set',
-                entityId: () => ''
-            },
-
             set_certificate: {
                 message: 'Certificate Set',
                 entityId: () => ''
diff --git a/platform_restrictions.json b/platform_restrictions.json
@@ -24,7 +24,6 @@
         "peer_to_peer_ports",
         "server_details",
         "cluster_connectivity_ip",
-        "remote_syslog",
         "toggle_endpoint_agent"
     ]
 }
diff --git a/src/api/stats_api.js b/src/api/stats_api.js
@@ -250,9 +250,6 @@ module.exports = {
                                     proxy: {
                                         type: 'boolean'
                                     },
-                                    remote_syslog: {
-                                        type: 'boolean'
-                                    },
                                 }
                             }
                         }
diff --git a/src/api/system_api.js b/src/api/system_api.js
@@ -324,32 +324,6 @@ module.exports = {
             }
         },
 
-        configure_remote_syslog: {
-            method: 'POST',
-            params: {
-                type: 'object',
-                required: ['enabled'],
-                properties: {
-                    enabled: {
-                        type: 'boolean'
-                    },
-                    protocol: {
-                        type: 'string',
-                        enum: ['TCP', 'UDP']
-                    },
-                    address: {
-                        type: 'string'
-                    },
-                    port: {
-                        type: 'number'
-                    }
-                }
-            },
-            auth: {
-                system: 'admin',
-            }
-        },
-
         attempt_server_resolve: {
             doc: 'Attempt to resolve a server name + ping',
             method: 'POST',
@@ -540,21 +514,6 @@ module.exports = {
                         },
                     }
                 },
-                remote_syslog_config: {
-                    type: 'object',
-                    properties: {
-                        protocol: {
-                            type: 'string',
-                            enum: ['TCP', 'UDP']
-                        },
-                        address: {
-                            type: 'string'
-                        },
-                        port: {
-                            type: 'number'
-                        }
-                    }
-                },
                 ip_address: {
                     type: 'string'
                 },
@@ -642,7 +601,6 @@ module.exports = {
                 "peer_to_peer_ports",
                 "server_details",
                 "cluster_connectivity_ip",
-                "remote_syslog",
                 "toggle_endpoint_agent"
             ],
         },
@@ -891,9 +849,6 @@ module.exports = {
                 ntp_server: {
                     $ref: '#/definitions/service_status_enum'
                 },
-                remote_syslog: {
-                    $ref: '#/definitions/service_dated_status'
-                },
                 cluster_communication: {
                     type: 'object',
                     properties: {
diff --git a/src/server/bg_services/server_monitor.js b/src/server/bg_services/server_monitor.js
@@ -65,11 +65,9 @@ async function run_monitors() {
     const os_type = os.type();
     const is_master = clustering_utils.check_if_master();
 
-    await _verify_remote_syslog_cluster_config();
     await _verify_server_certificate();
     await _check_dns_and_phonehome();
     await _check_proxy_configuration();
-    await _check_remote_syslog();
     await _check_internal_ips();
     await _check_disk_space();
 
@@ -107,23 +105,6 @@ function _verify_server_certificate() {
         });
 }
 
-function _verify_remote_syslog_cluster_config() {
-    dbg.log2('Verifying remote syslog server configuration in relation to cluster config');
-    let system = system_store.data.systems[0];
-    let syslog_conf = _.clone(system.remote_syslog_config);
-    return os_utils.get_syslog_server_configuration()
-        .then(platform_syslog_server => {
-            if (!_are_platform_and_cluster_conf_equal(platform_syslog_server, syslog_conf)) {
-                dbg.warn(`platform remote syslog not synced to cluster. Platform conf: `, platform_syslog_server, 'cluster_conf:', syslog_conf);
-                if (syslog_conf) {
-                    syslog_conf.enabled = true;
-                }
-                return os_utils.reload_syslog_configuration(syslog_conf);
-            }
-        })
-        .catch(err => dbg.error('failed to reconfigure remote syslog cluster config on the server. reason:', (err && err.code) || err));
-}
-
 function _are_platform_and_cluster_conf_equal(platform_conf, cluster_conf) {
     platform_conf = _.omitBy(platform_conf, _.isEmpty);
     cluster_conf = _.omitBy(cluster_conf, _.isEmpty);
@@ -241,28 +222,6 @@ function _check_proxy_configuration() {
         });
 }
 
-function _check_remote_syslog() {
-    dbg.log2('_check_remote_syslog');
-    let system = system_store.data.systems[0];
-    if (_.isEmpty(system.remote_syslog_config)) return;
-    if (_.isEmpty(system.remote_syslog_config.address)) return;
-    monitoring_status.remote_syslog_status = {
-        test_time: moment().unix()
-    };
-    return net_utils.ping(system.remote_syslog_config.address)
-        .then(() => {
-            monitoring_status.remote_syslog_status.status = "OPERATIONAL";
-        })
-        .catch(err => {
-            monitoring_status.remote_syslog_status.status = "UNREACHABLE";
-            Dispatcher.instance().alert('MAJOR',
-                system_store.data.systems[0]._id,
-                `Remote syslog server ${system.remote_syslog_config.address} could not be reached, check Syslog configuration or connectivity`,
-                Dispatcher.rules.once_daily);
-            dbg.warn('Error when trying to check remote syslog status.', err.stack || err);
-        });
-}
-
 function _check_internal_ips() {
     dbg.log2('_check_internal_ips');
     return server_rpc.client.cluster_server.check_cluster_status()
diff --git a/src/server/system_services/schemas/cluster_schema.js b/src/server/system_services/schemas/cluster_schema.js
@@ -304,10 +304,6 @@ module.exports = {
                     type: 'string',
                     enum: ['UNKNOWN', 'FAULTY', 'UNREACHABLE', 'OPERATIONAL']
                 },
-                remote_syslog_status: {
-                    type: 'string',
-                    enum: ['UNKNOWN', 'FAULTY', 'UNREACHABLE', 'OPERATIONAL']
-                },
                 cluster_status: {
                     anyOf: [{
                         type: 'string',
diff --git a/src/server/system_services/schemas/system_schema.js b/src/server/system_services/schemas/system_schema.js
@@ -103,22 +103,6 @@ module.exports = {
             },
         },
 
-        //Remote syslog configuration
-        remote_syslog_config: {
-            type: 'object',
-            properties: {
-                protocol: {
-                    type: 'string'
-                },
-                address: {
-                    type: 'string'
-                },
-                port: {
-                    type: 'number'
-                }
-            }
-        },
-
         bg_workers_info: {
             type: 'object',
             properties: {
diff --git a/src/server/system_services/stats_aggregator.js b/src/server/system_services/stats_aggregator.js
@@ -87,7 +87,6 @@ const SINGLE_SYS_DEFAULTS = {
         dns_name: false,
         ntp_server: false,
         proxy: false,
-        remote_syslog: false
     },
     cluster: {
         members: 0
@@ -188,7 +187,6 @@ async function get_systems_stats(req) {
                     dns_name: has_dns_name,
                     ntp_server: !_.isEmpty(res.cluster.shards[0].servers[0].ntp_server),
                     proxy: !_.isEmpty(res.phone_home_config.proxy_address),
-                    remote_syslog: !_.isEmpty(res.remote_syslog_config),
                 },
                 cluster: {
                     members: res.cluster.shards[0].servers.length
diff --git a/src/server/system_services/system_server.js b/src/server/system_services/system_server.js
@@ -629,7 +629,6 @@ function read_system(req) {
             ip_address: ip_address,
             dns_name: dns_name,
             base_address: base_address.toString(),
-            remote_syslog_config: system.remote_syslog_config,
             phone_home_config: phone_home_config,
             version: pkg.version,
             node_version: process.version,
@@ -1006,47 +1005,6 @@ function update_phone_home_config(req) {
         .return();
 }
 
-function configure_remote_syslog(req) {
-    let params = req.rpc_params;
-    dbg.log0('configure_remote_syslog', params);
-
-    let update = {
-        _id: req.system._id
-    };
-    let desc_line = '';
-    if (params.enabled) {
-        if (!params.protocol || !params.address || !params.port) {
-            throw new RpcError('INVALID_REQUEST', 'Missing protocol, address or port');
-        }
-        desc_line = `remote syslog was directed to: ${params.address}:${params.port}`;
-        update.remote_syslog_config = _.pick(params, 'protocol', 'address', 'port');
-
-    } else {
-        desc_line = 'Disabled remote syslog';
-        update.$unset = {
-            remote_syslog_config: 1
-        };
-    }
-
-    return P.resolve()
-        .then(() => system_store.make_changes({
-            update: {
-                systems: [update]
-            }
-        }))
-        .then(() => os_utils.reload_syslog_configuration(params))
-        .then(() => {
-            Dispatcher.instance().activity({
-                event: 'conf.remote_syslog',
-                level: 'info',
-                system: req.system._id,
-                actor: req.account && req.account._id,
-                desc: desc_line,
-            });
-        })
-        .return();
-}
-
 function set_certificate(zip_file) {
     dbg.log0('upload_certificate');
     let key;
@@ -1285,7 +1243,6 @@ exports.verify_phonehome_connectivity = verify_phonehome_connectivity;
 exports.update_phone_home_config = update_phone_home_config;
 exports.set_maintenance_mode = set_maintenance_mode;
 exports.set_webserver_master_state = set_webserver_master_state;
-exports.configure_remote_syslog = configure_remote_syslog;
 exports.set_certificate = set_certificate;
 
 exports.get_node_installation_string = get_node_installation_string;
diff --git a/src/server/utils/clustering_utils.js b/src/server/utils/clustering_utils.js
@@ -209,7 +209,6 @@ function get_cluster_info(rs_status) {
                 phonehome_server: status.ph_status,
                 phonehome_proxy: status.proxy_status,
                 ntp_server: status.ntp_status,
-                remote_syslog: status.remote_syslog_status,
                 cluster_communication: {
                     test_completed: status.cluster_status !== 'UNKNOWN',
                     results: status.cluster_status === 'UNKNOWN' ? undefined : status.cluster_status
diff --git a/src/test/qa/system_config.js b/src/test/qa/system_config.js
diff --git a/src/tools/events_generator.js b/src/tools/events_generator.js
diff --git a/src/util/os_utils.js b/src/util/os_utils.js

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,6 @@`
`24`	`24`	`"peer_to_peer_ports",`
`25`	`25`	`"server_details",`
`26`	`26`	`"cluster_connectivity_ip",`
`27`		`- "remote_syslog",`
`28`	`27`	`"toggle_endpoint_agent"`
`29`	`28`	`]`
`30`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -250,9 +250,6 @@ module.exports = {`
`250`	`250`	`proxy: {`
`251`	`251`	`type: 'boolean'`
`252`	`252`	`},`
`253`		`- remote_syslog: {`
`254`		`- type: 'boolean'`
`255`		`- },`
`256`	`253`	`}`
`257`	`254`	`}`
`258`	`255`	`}`