summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorLadue, David (dl3158) <dl3158@att.com>2018-03-14 14:01:36 -0400
committerLadue, David (dl3158) <dl3158@att.com>2018-03-18 02:42:23 -0400
commitabb283c5a3b72eb2d91e6adb4eda68184f040f35 (patch)
tree4765c8d6cb54a2ddb2052c0955425604bc265230 /etc
parenta6f91efda578965710630154b173cf1ee9b64727 (diff)
copyright and controller ENV changes
Change-Id: Ic12aa439a03f19c7a06a536368a8d2a1f26855aa Issue-ID: DCAEGEN2-271 Signed-off-by: Ladue, David (dl3158) <dl3158@att.com>
Diffstat (limited to 'etc')
-rw-r--r--etc/dcae_snmptrapd.yaml41
-rw-r--r--etc/dcae_snmptrapd_logging.yaml57
-rw-r--r--etc/snmptrapd.json69
-rw-r--r--etc/trap.conf3
-rw-r--r--etc/trapd.yaml51
-rw-r--r--etc/trapd_logging.yaml57
6 files changed, 69 insertions, 209 deletions
diff --git a/etc/dcae_snmptrapd.yaml b/etc/dcae_snmptrapd.yaml
deleted file mode 100644
index 0b4feb7..0000000
--- a/etc/dcae_snmptrapd.yaml
+++ /dev/null
@@ -1,41 +0,0 @@
-# ================================================================================
-# Copyright (c) 2017-2018 AT&T Intellectual Property. All rights reserved.
-# ================================================================================
-# Licensed 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.
-# ============LICENSE_END=========================================================
-#
-# ECOMP is a trademark and service mark of AT&T Intellectual Property.
-protocol:
- transport: udp
- interface: localhost
- port: 6163
- dns_cache_ttl_seconds: 60
-
-files:
- runtime_base_dir: /opt/app/dcae_snmptrapd
- log_dir: /opt/app/dcae_snmptrapd/logs
- data_dir: /opt/app/dcae_snmptrapd/data
- pid_dir: /var/tmp
- dcae_snmptrapd_diag: /opt/app/dcae_snmptrapd/logs/dcae_snmptrapd.log
- raw_traps_log: /opt/app/dcae_snmptrapd/logs/trapd.log
- published_traps_dir: /opt/app/dcae_snmptrapd/logs
- trap_stats_log: /opt/app/dcae_snmptrapd/logs/dcae_snmptrapd_stats.csv
- perm_status_file: /opt/app/dcae_snmptrapd/logs/dcae_snmptrapd.permStatus.log
-
-ueb:
- dmaap_conf: /etc/dcae/dmaap.conf
- http_timeout: 5
- primary_publisher: true
- peer_publisher: null
- max_traps_between_publish: 50
- max_milliseconds_between_publish: 3500
diff --git a/etc/dcae_snmptrapd_logging.yaml b/etc/dcae_snmptrapd_logging.yaml
deleted file mode 100644
index 43af342..0000000
--- a/etc/dcae_snmptrapd_logging.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
-# ================================================================================
-# Copyright (c) 2017-2018 AT&T Intellectual Property. All rights reserved.
-# ================================================================================
-# Licensed 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.
-# ============LICENSE_END=========================================================
-#
-# ECOMP is a trademark and service mark of AT&T Intellectual Property.
-version: 1
-disable_existing_loggers: False
-formatters:
- simple:
- format: "%(levelname)s|%(asctime)s|%(name)s|%(process)d|%(funcName)s|'%(message)s"
-
-handlers:
- console:
- class: logging.StreamHandler
- level: DEBUG
- formatter: simple
- stream: ext://sys.stdout
-
- info_file_handler:
- class: logging.handlers.RotatingFileHandler
- level: INFO
- formatter: simple
- filename: info.log
- maxBytes: 10480000 # 10MB
- backupCount: 10
- encoding: utf8
-
- error_file_handler:
- class: logging.handlers.RotatingFileHandler
- level: ERROR
- formatter: simple
- filename: errors.log
- maxBytes: 6144000 # 6MB
- backupCount: 10
- encoding: utf8
-
-loggers:
- my_module:
- level: ERROR
- handlers: [console]
- propagate: no
-
-root:
- level: INFO
- handlers: [console, info_file_handler, error_file_handler]
diff --git a/etc/snmptrapd.json b/etc/snmptrapd.json
new file mode 100644
index 0000000..c9caa76
--- /dev/null
+++ b/etc/snmptrapd.json
@@ -0,0 +1,69 @@
+{
+"snmptrap.version": "1.3.0",
+"snmptrap.title": "ONAP SNMP Trap Receiver" ,
+"protocols.transport": "udp",
+"protocols.ipv4_interface": "0.0.0.0",
+"protocols.ipv4_port": 6164,
+"protocols.ipv6_interface": "::1",
+"protocols.ipv6_port": 6164,
+"cache.dns_cache_ttl_seconds": 60,
+"publisher.http_timeout_milliseconds": 1500,
+"publisher.http_retries": 3,
+"publisher.http_milliseconds_between_retries": 750,
+"publisher.http_primary_publisher": "true",
+"publisher.http_peer_publisher": "unavailable",
+"publisher.max_traps_between_publishes": 10,
+"publisher.max_milliseconds_between_publishes": 10000,
+ "streams_publishes": {
+ "sec_measurement": {
+ "type": "message_router",
+ "aaf_password": "aaf_password",
+ "dmaap_info": {
+ "location": "mtl5",
+ "client_id": "111111",
+ "client_role": "com.att.dcae.member",
+ "topic_url": null
+ },
+ "aaf_username": "aaf_username"
+ },
+ "sec_fault_unsecure": {
+ "type": "message_router",
+ "aaf_password": null,
+ "dmaap_info": {
+ "location": "mtl5",
+ "client_id": null,
+ "client_role": null,
+ "topic_url": "http://ueb_server:3904/events/ONAP-COLLECTOR-SNMPTRAP"
+ },
+ "aaf_username": null
+ }
+ },
+"files.runtime_base_dir": "/opt/app/snmptrap",
+"files.log_dir": "logs",
+"files.data_dir": "data",
+"files.pid_dir": "tmp",
+"files.arriving_traps_log": "snmptrapd_arriving_traps.log",
+"files.snmptrapd_diag": "snmptrapd_prog_diag.log",
+"files.traps_stats_log": "snmptrapd_stats.csv",
+"files.perm_status_file": "snmptrapd_status.log",
+"files.eelf_base_dir": "/opt/app/snmptrap/logs",
+"files.eelf_error": "error.log",
+"files.eelf_debug": "debug.log",
+"files.eelf_audit": "audit.log",
+"files.eelf_metrics": "metrics.log",
+"files.roll_frequency": "hour",
+"files.minimum_severity_to_log": 2,
+"trap_def.1.trap_oid" : ".1.3.6.1.4.1.74.2.46.12.1.1",
+"trap_def.1.trap_category": "DCAE-SNMP-TRAPS",
+"trap_def.2.trap_oid" : "*",
+"trap_def.2.trap_category": "DCAE-SNMP-TRAPS",
+"stormwatch.1.stormwatch_oid" : ".1.3.6.1.4.1.74.2.46.12.1.1",
+"stormwatch.1.low_water_rearm_per_minute" : "5",
+"stormwatch.1.high_water_arm_per_minute" : "100",
+"stormwatch.2.stormwatch_oid" : ".1.3.6.1.4.1.74.2.46.12.1.2",
+"stormwatch.2.low_water_rearm_per_minute" : "2",
+"stormwatch.2.high_water_arm_per_minute" : "200",
+"stormwatch.3.stormwatch_oid" : ".1.3.6.1.4.1.74.2.46.12.1.2",
+"stormwatch.3.low_water_rearm_per_minute" : "2",
+"stormwatch.3.high_water_arm_per_minute" : "200"
+}
diff --git a/etc/trap.conf b/etc/trap.conf
deleted file mode 100644
index 56c6c3a..0000000
--- a/etc/trap.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-#
-.1.3.6.1.4.1.74.2.46.12.1.1 DCAE-SNMP-TRAPS
-* DCAE-SNMP-TRAPS
diff --git a/etc/trapd.yaml b/etc/trapd.yaml
deleted file mode 100644
index 7432e56..0000000
--- a/etc/trapd.yaml
+++ /dev/null
@@ -1,51 +0,0 @@
-# ================================================================================
-# Copyright (c) 2018 AT&T Intellectual Property. All rights reserved.
-# ================================================================================
-# Licensed 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.
-# ============LICENSE_END=========================================================
-#
-# ECOMP is a trademark and service mark of AT&T Intellectual Property.
-snmptrap: '2.0'
-info:
- version: 2.1
- title: ONAP SNMP Trap Receiver
-
-protocol:
- transport: udp
- ipv4_interface: 0.0.0.0
- ipv4_port: 6164
- ipv6_interface: ::1
- ipv6_port: 6164
- dns_cache_ttl_seconds: 60
-
-files:
- runtime_base_dir: /opt/app/snmptrap
- log_dir: /opt/app/snmptrap/logs
- data_dir: /opt/app/snmptrap/data
- pid_dir: /var/tmp
- snmptrapd_diag: /opt/app/snmptrap/logs/dcae_snmptrap.log
- trap_conf: /opt/app/snmptrap/etc/trap.conf
- raw_traps_log: /opt/app/snmptrap/logs/trapd.log
- published_traps_dir: /opt/app/snmptrap/logs
- trap_stats_log: /opt/app/snmptrap/logs/trapd_stats.csv
- perm_status_file: /opt/app/snmptrap/logs/trapd.perm_status.log
-
-dmaap:
- dmaap_conf: /etc/dcae/dmaap.conf
- http_timeout: 5
- http_retries: 3
- http_secs_between_retries: .75
- primary_publisher: true
- peer_publisher: null
- max_traps_between_publish: 50
- max_milliseconds_between_publish: 3500
diff --git a/etc/trapd_logging.yaml b/etc/trapd_logging.yaml
deleted file mode 100644
index 6719e5e..0000000
--- a/etc/trapd_logging.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
-# ================================================================================
-# Copyright (c) 2018 AT&T Intellectual Property. All rights reserved.
-# ================================================================================
-# Licensed 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.
-# ============LICENSE_END=========================================================
-#
-# ECOMP is a trademark and service mark of AT&T Intellectual Property.
-version: 1
-disable_existing_loggers: False
-formatters:
- simple:
- format: "%(levelname)s|%(asctime)s|%(name)s|%(process)d|%(funcName)s|'%(message)s"
-
-handlers:
- console:
- class: logging.StreamHandler
- level: DEBUG
- formatter: simple
- stream: ext://sys.stdout
-
- info_file_handler:
- class: logging.handlers.RotatingFileHandler
- level: INFO
- formatter: simple
- filename: info.log
- maxBytes: 10480000 # 10MB
- backupCount: 10
- encoding: utf8
-
- error_file_handler:
- class: logging.handlers.RotatingFileHandler
- level: ERROR
- formatter: simple
- filename: errors.log
- maxBytes: 6144000 # 6MB
- backupCount: 10
- encoding: utf8
-
-loggers:
- my_module:
- level: ERROR
- handlers: [console]
- propagate: no
-
-root:
- level: INFO
- handlers: [console, info_file_handler, error_file_handler]