From 958c32d2d7a3e5cbd9bc672645cdeb95a49b719a Mon Sep 17 00:00:00 2001
From: Yuli Shlosberg <ys9693@att.com>
Date: Thu, 15 Feb 2018 12:04:46 +0200
Subject: OOM Alignment BE,FE,KBN

Change-Id: I8ff609a6be919d5709ce95af5a6a903aeb7afc43
Issue-ID: SDC-918
Signed-off-by: Yuli Shlosberg <ys9693@att.com>
---
 .../default/FE-ecomp-error-configuration.yaml      |  48 -----
 .../sdc-catalog-fe/files/default/FE-logback.xml    | 227 ---------------------
 .../files/default/FE-rest-configuration.yaml       |  11 -
 .../sdc-catalog-fe/files/default/keystore          | Bin 4255 -> 0 bytes
 4 files changed, 286 deletions(-)
 delete mode 100644 sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/files/default/FE-ecomp-error-configuration.yaml
 delete mode 100644 sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/files/default/FE-logback.xml
 delete mode 100644 sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/files/default/FE-rest-configuration.yaml
 delete mode 100644 sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/files/default/keystore

(limited to 'sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/files')

diff --git a/sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/files/default/FE-ecomp-error-configuration.yaml b/sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/files/default/FE-ecomp-error-configuration.yaml
deleted file mode 100644
index 8982b2424f..0000000000
--- a/sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/files/default/FE-ecomp-error-configuration.yaml
+++ /dev/null
@@ -1,48 +0,0 @@
-###########################################
-# Note the conventions of the field values:
-# type can be one of: CONFIG_ERROR, SYSTEM_ERROR, DATA_ERROR, CONNECTION_PROBLEM
-# severity can be one of: WARN, ERROR, FATAL
-# alarmSeverity can be one of: CRITICAL,MAJOR,MINOR,INFORMATIONAL,NONE
-# code is a unique integer in range of 3003-9999 (3000-3002 are occupied for internal usage)
-# The above enumeration values are out-of-the-box and can be changed in code. 
-# In case of config and code mismatch, the appropriate error will be printed to log
-#
-# Range of FE codes - 8000-9999
-
-
-errors:
-    FeHealthCheckConnectionError: {
-        type: CONNECTION_PROBLEM,
-        code: ASDC_8000,
-        severity: ERROR,
-        description: "Connection error during FE Health Check",
-        alarmSeverity: CRITICAL
-    }
-    FeHttpLoggingError: {
-        type: SYSTEM_ERROR,
-        code: ASDC_8001,
-        severity: ERROR,
-        description: "Error when logging FE HTTP request/response",
-        alarmSeverity: MINOR
-    }
-    FePortalServletError: {
-        type: SYSTEM_ERROR,
-        code: ASDC_8002,
-        severity: ERROR,
-        description: "Error when trying to access FE Portal page",
-        alarmSeverity: MAJOR
-    }
-    FeHealthCheckGeneralError: {
-        type: SYSTEM_ERROR,
-        code: ASDC_8004,
-        severity: ERROR,
-        description: "General error during FE Health Check",
-        alarmSeverity: CRITICAL
-    }
-    FeHealthCheckRecovery: {
-        type: RECOVERY,
-        code: ASDC_8005,
-        severity: INFO,
-        description: "BE Health Check Recovery",
-        alarmSeverity: INFORMATIONAL
-    }    
\ No newline at end of file
diff --git a/sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/files/default/FE-logback.xml b/sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/files/default/FE-logback.xml
deleted file mode 100644
index 2f793f386b..0000000000
--- a/sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/files/default/FE-logback.xml
+++ /dev/null
@@ -1,227 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration scan="true" scanPeriod="5 seconds">
-
-        <property scope="system" name="ECOMP-component-name" value="ASDC" />
-        <property scope="system" name="ECOMP-subcomponent-name" value="ASDC-FE" />
-        <property file="${config.home}/catalog-fe/configuration.yaml" />
-        <property scope="context" name="enable-all-log" value="false" />
-
-        <!-- value used by pattern field list (| - is inter-field separator, || - unavailable or not applicable field value) (m - mandatory, o- optional)-->
-        <!--timestamp(m)| requestID(m)| serviceInstanceID(o)| threadID(m)| physicalServerName(o)| serviceName(m)| userID(m)| logLevel(m)| severity(o)| serverIpAddress(m)| serverName(m)| clientIpAddress(o)| className(m)| timer(o)| detailedMessage(o)-->
-        <property name="default-log-pattern"
-                value="%d{yyyy-MM-dd'T'HH:mm:ss.SSSXXX}|%X{uuid}|%X{serviceInstanceID}|%thread||${ECOMP-subcomponent-name}|%X{userId}|%level|%X{alarmSeverity}|%X{localAddr}|${feFqdn}|%X{remoteAddr}|%logger{35}|%X{timer}|ActivityType=&lt;%M&gt;, Desc=&lt;%msg&gt;%n" />
-
-        <!-- All log -->
-        <if condition='property("enable-all-log").equalsIgnoreCase("true")'>
-                <then>
-                        <appender name="ALL_ROLLING"
-                                class="ch.qos.logback.core.rolling.RollingFileAppender">
-                                <file>${log.home}/${ECOMP-component-name}/${ECOMP-subcomponent-name}/all.log
-                                </file>
-
-                                <rollingPolicy
-                                        class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
-                                        <fileNamePattern>${log.home}/${ECOMP-component-name}/${ECOMP-subcomponent-name}/all.log.%i
-                                        </fileNamePattern>
-                                        <minIndex>1</minIndex>
-                                        <maxIndex>10</maxIndex>
-                                </rollingPolicy>
-
-                                <triggeringPolicy
-                                        class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
-                                        <maxFileSize>20MB</maxFileSize>
-                                </triggeringPolicy>
-                                <encoder>
-                                        <pattern>${default-log-pattern}</pattern>
-                                </encoder>
-                        </appender>
-
-                        <appender name="ASYNC_ALL" class="ch.qos.logback.classic.AsyncAppender">
-                                <appender-ref ref="ALL_ROLLING" />
-                        </appender>
-                </then>
-        </if>
-
-        <!-- Error log -->
-        <appender name="ERROR_ROLLING"
-                class="ch.qos.logback.core.rolling.RollingFileAppender">
-                <file>${log.home}/${ECOMP-component-name}/${ECOMP-subcomponent-name}/error.log
-                </file>
-
-                <!-- Audit messages filter - deny audit messages -->
-                <filter class="ch.qos.logback.core.filter.EvaluatorFilter">
-                        <evaluator class="ch.qos.logback.classic.boolex.OnMarkerEvaluator">
-                                <marker>AUDIT_MARKER</marker>
-                        </evaluator>
-                        <onMismatch>NEUTRAL</onMismatch>
-                        <onMatch>DENY</onMatch>
-                </filter>
-
-                <!-- Transaction messages filter - deny Transaction messages -->
-                <filter class="ch.qos.logback.core.filter.EvaluatorFilter">
-                        <evaluator class="ch.qos.logback.classic.boolex.OnMarkerEvaluator">
-                                <marker>TRANSACTION_MARKER</marker>
-                        </evaluator>
-                        <onMismatch>NEUTRAL</onMismatch>
-                        <onMatch>DENY</onMatch>
-                </filter>
-
-                <!-- deny all events with a level below INFO, that is TRACE and DEBUG -->
-                <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-                        <level>INFO</level>
-                </filter>
-
-                <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
-                        <fileNamePattern>${log.home}/${ECOMP-component-name}/${ECOMP-subcomponent-name}/error.log.%i
-                        </fileNamePattern>
-                        <minIndex>1</minIndex>
-                        <maxIndex>10</maxIndex>
-                </rollingPolicy>
-
-                <triggeringPolicy
-                        class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
-                        <maxFileSize>20MB</maxFileSize>
-                </triggeringPolicy>
-                <encoder>
-                        <pattern>${default-log-pattern}</pattern>
-                </encoder>
-        </appender>
-
-        <!-- Debug log -->
-        <appender name="DEBUG_ROLLING"
-                class="ch.qos.logback.core.rolling.RollingFileAppender">
-                <file>${log.home}/${ECOMP-component-name}/${ECOMP-subcomponent-name}/debug.log
-                </file>
-
-                <!-- No need to deny audit messages - they are INFO only, will be denied
-                        anyway -->
-                <!-- Transaction messages filter - deny Transaction messages, there are
-                        some DEBUG level messages among them -->
-                <filter class="ch.qos.logback.core.filter.EvaluatorFilter">
-                        <evaluator class="ch.qos.logback.classic.boolex.OnMarkerEvaluator">
-                                <marker>TRANSACTION_MARKER</marker>
-                        </evaluator>
-                        <onMismatch>NEUTRAL</onMismatch>
-                        <onMatch>DENY</onMatch>
-                </filter>
-
-                <!-- accept DEBUG and TRACE level -->
-                <filter class="ch.qos.logback.core.filter.EvaluatorFilter">
-                        <evaluator class="ch.qos.logback.classic.boolex.GEventEvaluator">
-                                <expression>
-                                        e.level.toInt() &lt;= DEBUG.toInt()
-                                </expression>
-                        </evaluator>
-                        <OnMismatch>DENY</OnMismatch>
-                        <OnMatch>NEUTRAL</OnMatch>
-                </filter>
-
-                <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
-                        <fileNamePattern>${log.home}/${ECOMP-component-name}/${ECOMP-subcomponent-name}/debug.log.%i
-                        </fileNamePattern>
-                        <minIndex>1</minIndex>
-                        <maxIndex>10</maxIndex>
-                </rollingPolicy>
-
-                <triggeringPolicy
-                        class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
-                        <maxFileSize>20MB</maxFileSize>
-                </triggeringPolicy>
-                <encoder>
-                        <pattern>${default-log-pattern}</pattern>
-                </encoder>
-        </appender>
-
-        <!-- Audit log -->
-        <appender name="AUDIT_ROLLING"
-                class="ch.qos.logback.core.rolling.RollingFileAppender">
-
-                <file>${log.home}/${ECOMP-component-name}/${ECOMP-subcomponent-name}/audit.log
-                </file>
-
-                <!-- Audit messages filter - accept audit messages -->
-                <filter class="ch.qos.logback.core.filter.EvaluatorFilter">
-                        <evaluator class="ch.qos.logback.classic.boolex.OnMarkerEvaluator">
-                                <marker>AUDIT_MARKER</marker>
-                        </evaluator>
-                        <onMismatch>DENY</onMismatch>
-                        <onMatch>ACCEPT</onMatch>
-                </filter>
-
-                <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
-                        <fileNamePattern>${log.home}/${ECOMP-component-name}/${ECOMP-subcomponent-name}/audit.log.%i
-                        </fileNamePattern>
-                        <minIndex>1</minIndex>
-                        <maxIndex>10</maxIndex>
-                </rollingPolicy>
-
-                <triggeringPolicy
-                        class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
-                        <maxFileSize>20MB</maxFileSize>
-                </triggeringPolicy>
-                <encoder>
-                        <pattern>${default-log-pattern}</pattern>
-                </encoder>
-        </appender>
-
-        <!-- SdncTransaction log -->
-        <appender name="TRANSACTION_ROLLING"
-                class="ch.qos.logback.core.rolling.RollingFileAppender">
-
-                <file>${log.home}/${ECOMP-component-name}/${ECOMP-subcomponent-name}/transaction.log
-                </file>
-
-                <!-- Transaction messages filter - accept audit messages -->
-                <filter class="ch.qos.logback.core.filter.EvaluatorFilter">
-                        <evaluator class="ch.qos.logback.classic.boolex.OnMarkerEvaluator">
-                                <marker>TRANSACTION_MARKER</marker>
-                        </evaluator>
-                        <onMismatch>DENY</onMismatch>
-                        <onMatch>ACCEPT</onMatch>
-                </filter>
-
-                <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
-                        <fileNamePattern>${log.home}/${ECOMP-component-name}/${ECOMP-subcomponent-name}/transaction.log.%i
-                        </fileNamePattern>
-                        <minIndex>1</minIndex>
-                        <maxIndex>10</maxIndex>
-                </rollingPolicy>
-
-                <triggeringPolicy
-                        class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
-                        <maxFileSize>20MB</maxFileSize>
-                </triggeringPolicy>
-                <encoder>
-                        <pattern>${default-log-pattern}</pattern>
-                </encoder>
-        </appender>
-
-        <!-- Asynchronicity Configurations -->
-        <appender name="ASYNC_DEBUG" class="ch.qos.logback.classic.AsyncAppender">
-              <appender-ref ref="DEBUG_ROLLING" />
-        </appender>
-
-        <appender name="ASYNC_TRANSACTION" class="ch.qos.logback.classic.AsyncAppender">
-              <appender-ref ref="TRANSACTION_ROLLING" />
-        </appender>
-
-        <appender name="ASYNC_ERROR" class="ch.qos.logback.classic.AsyncAppender">
-              <appender-ref ref="ERROR_ROLLING" />
-        </appender>
-
-
-        <root level="INFO">
-                <appender-ref ref="ASYNC_ERROR" />
-                <appender-ref ref="ASYNC_DEBUG" />
-                <appender-ref ref="AUDIT_ROLLING" />
-                <appender-ref ref="ASYNC_TRANSACTION" />
-                <if condition='property("enable-all-log").equalsIgnoreCase("true")'>
-                        <then>
-                                <appender-ref ref="ALL_ROLLING" />
-                        </then>
-                </if>
-        </root>
-
-        <logger name="org.openecomp.sdc" level="INFO" />
-</configuration>
-
diff --git a/sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/files/default/FE-rest-configuration.yaml b/sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/files/default/FE-rest-configuration.yaml
deleted file mode 100644
index ecedafea56..0000000000
--- a/sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/files/default/FE-rest-configuration.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-# rest read timeout - means no timeout
-readTimeoutInSec: 0
-
-# whether to ignore certificate
-ignoreCertificate: false
-
-# the connection pool size
-connectionPoolSize: 10
-
-# create connection timeout
-connectTimeoutInSec: 10
diff --git a/sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/files/default/keystore b/sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/files/default/keystore
deleted file mode 100644
index c4083931dc..0000000000
Binary files a/sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/files/default/keystore and /dev/null differ
-- 
cgit 1.2.3-korg