METRON-1417: Disable pcap-service by default in Monit (mmiklavc via mmiklavc) 
closes apache/metron#905


Project: http://git-wip-us.apache.org/repos/asf/metron/repo
Commit: http://git-wip-us.apache.org/repos/asf/metron/commit/40411d4b
Tree: http://git-wip-us.apache.org/repos/asf/metron/tree/40411d4b
Diff: http://git-wip-us.apache.org/repos/asf/metron/diff/40411d4b

Branch: refs/heads/feature/METRON-1344-test-infrastructure
Commit: 40411d4bdbb729d0e38e69a15a06970738a4b969
Parents: 9d582ea
Author: mmiklavc <michael.miklav...@gmail.com>
Authored: Wed Jan 24 15:33:08 2018 -0700
Committer: Michael Miklavcic <michael.miklav...@gmail.com>
Committed: Wed Jan 24 15:33:08 2018 -0700

----------------------------------------------------------------------
 metron-deployment/amazon-ec2/conf/defaults.yml  |  1 -
 .../inventory/full-dev-platform/group_vars/all  |  1 -
 .../roles/monit/tasks/monit-definitions.yml     |  5 -----
 .../monit/templates/monit/pcap-service.monit    | 22 --------------------
 4 files changed, 29 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/metron/blob/40411d4b/metron-deployment/amazon-ec2/conf/defaults.yml
----------------------------------------------------------------------
diff --git a/metron-deployment/amazon-ec2/conf/defaults.yml 
b/metron-deployment/amazon-ec2/conf/defaults.yml
index ab5bfa9..124d7ab 100644
--- a/metron-deployment/amazon-ec2/conf/defaults.yml
+++ b/metron-deployment/amazon-ec2/conf/defaults.yml
@@ -17,7 +17,6 @@
 ---
 # which services should be started?
 services_to_start:
-  - pcap-service
   - yaf
   - snort
   - snort-logs

http://git-wip-us.apache.org/repos/asf/metron/blob/40411d4b/metron-deployment/inventory/full-dev-platform/group_vars/all
----------------------------------------------------------------------
diff --git a/metron-deployment/inventory/full-dev-platform/group_vars/all 
b/metron-deployment/inventory/full-dev-platform/group_vars/all
index 35fa154..c07278b 100644
--- a/metron-deployment/inventory/full-dev-platform/group_vars/all
+++ b/metron-deployment/inventory/full-dev-platform/group_vars/all
@@ -17,7 +17,6 @@
 
 # which services should be started?
 services_to_start:
-  - pcap-service
   - snort
   - snort-logs
   - bro

http://git-wip-us.apache.org/repos/asf/metron/blob/40411d4b/metron-deployment/roles/monit/tasks/monit-definitions.yml
----------------------------------------------------------------------
diff --git a/metron-deployment/roles/monit/tasks/monit-definitions.yml 
b/metron-deployment/roles/monit/tasks/monit-definitions.yml
index c9f5f07..13e00fc 100644
--- a/metron-deployment/roles/monit/tasks/monit-definitions.yml
+++ b/metron-deployment/roles/monit/tasks/monit-definitions.yml
@@ -20,8 +20,3 @@
   template: src=monit/pcap-replay.monit dest={{ monit_config_home 
}}/pcap-replay.monit
   when: ("sensors" in group_names) and (install_pcap_replay | default(False))
   tags: sensors
-  
-- name: Create monit definition for pcap-service
-  template: src=monit/pcap-service.monit dest={{ monit_config_home 
}}/pcap-service.monit
-  when: ("pcap_server" in group_names)
-

http://git-wip-us.apache.org/repos/asf/metron/blob/40411d4b/metron-deployment/roles/monit/templates/monit/pcap-service.monit
----------------------------------------------------------------------
diff --git a/metron-deployment/roles/monit/templates/monit/pcap-service.monit 
b/metron-deployment/roles/monit/templates/monit/pcap-service.monit
deleted file mode 100644
index 3f39c99..0000000
--- a/metron-deployment/roles/monit/templates/monit/pcap-service.monit
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-#  Licensed to the Apache Software Foundation (ASF) under one or more
-#  contributor license agreements.  See the NOTICE file distributed with
-#  this work for additional information regarding copyright ownership.
-#  The ASF licenses this file to You under the Apache License, Version 2.0
-#  (the "License"); you may not use this file except in compliance with
-#  the License.  You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS,
-#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#  See the License for the specific language governing permissions and
-#  limitations under the License.
-#
-check process pcap-service matching 
"org.apache.metron.pcapservice.rest.PcapService"
-  start program = "/etc/init.d/pcapservice start"
-  stop program = "/etc/init.d/pcapservice stop"
-  if does not exist then restart
-  group web
-  group metron

Reply via email to