Remove redundant filebeat from portal-db

Portal-db is maria-db. It has no logback.xml configuration.
The filebeat in this pod is redundant.
Issue-ID: OOM-517
Signed-off-by: BorislavG <Borislav.Glozman@amdocs.com>
Change-Id: I9118491ff6d9c51851cc915143b9962d98a883e4

diff --git a/kubernetes/config/docker/init/src/config/log/portal/portal-db/logback.xml b/kubernetes/config/docker/init/src/config/log/portal/portal-db/logback.xml
deleted file mode 100644 (file)
index 4990fac..0000000
--- a/kubernetes/config/docker/init/src/config/log/portal/portal-db/logback.xml
+++ /dev/null
@@ -1,306 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<configuration debug="true" scan="true" scanPeriod="3 seconds">\r
-    <!--\r
-  Logback files for the ECOMP SDK Application "ecomp_app"\r
-  are created in directory ${catalina.base}/logs/ecomp_app;\r
-  e.g., apache-tomcat-8.0.35/logs/ecomp_app/application.log\r
-  -->\r
-    <!--<jmxConfigurator /> -->\r
-    <!--  specify the component name -->\r
-    <property name="componentName" value="portal"></property>\r
-    <property name="subComponentName" value="portalDB"></property>\r
-    <!--  specify the base path of the log directory -->\r
-    <property name="logDirPrefix" value="/var/log/onap"></property>\r
-    <!-- The directories where logs are written -->\r
-    <property name="logDirectory" value="${logDirPrefix}/${componentName}/${subComponentName}" />\r
-    <!-- Can easily relocate debug logs by modifying this path. -->\r
-    <property name="debugLogDirectory" value="${logDirPrefix}/${componentName}/${subComponentName}" />\r
-    <!--  log file names -->\r
-    <property name="generalLogName" value="application" />\r
-    <property name="errorLogName" value="error" />\r
-    <property name="metricsLogName" value="metrics" />\r
-    <property name="auditLogName" value="audit" />\r
-    <property name="debugLogName" value="debug" />\r
-    <!--\r
-  These loggers are not used in code (yet).\r
-  <property name="securityLogName" value="security" />\r
-  <property name="policyLogName" value="policy" />\r
-  <property name="performanceLogName" value="performance" />\r
-  <property name="serverLogName" value="server" />\r
-   -->\r
-    <property name="pattern" value="%d{&quot;yyyy-MM-dd'T'HH:mm:ss.SSSXXX&quot;, UTC}\t[%thread]\t%-5level\t%logger{36}\t%replace(%replace(%replace(%mdc){'\t','\\\\t'}){', ','\t'}){'\n', '\\\\n'}\t%replace(%replace(%msg){'\n', '\\\\n'}){'\t','\\\\t'}%n" />\r
-    <property name="maxHistory" value="30" />\r
-    <property name="queueSize" value="256" />\r
-    <property name="maxFileSize" value="50MB" />\r
-    <property name="totalSizeCap" value="10GB" />\r
-    <!-- Example evaluator filter applied against console appender -->\r
-    <appender class="ch.qos.logback.core.ConsoleAppender" name="STDOUT">\r
-        <encoder>\r
-            <pattern>${pattern}</pattern>\r
-        </encoder>\r
-    </appender>\r
-    <!-- ============================================================================ -->\r
-    <!-- EELF Appenders -->\r
-    <!-- ============================================================================ -->\r
-    <!-- The EELFAppender is used to record events to the general application\r
-    log -->\r
-    <appender class="ch.qos.logback.core.rolling.RollingFileAppender" name="EELF">\r
-        <file>${logDirectory}/${generalLogName}.log</file>\r
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">\r
-            <!-- daily rollover -->\r
-            <fileNamePattern>${logDirectory}/${generalLogName}.%d{yyyy-MM-dd}.%i.log</fileNamePattern>\r
-            <!-- keep 30 days' worth of history capped at ${totalSizeCap} total size -->\r
-            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">\r
-                <maxFileSize>${maxFileSize}</maxFileSize>\r
-            </timeBasedFileNamingAndTriggeringPolicy>\r
-            <maxHistory>${maxHistory}</maxHistory>\r
-            <totalSizeCap>${totalSizeCap}</totalSizeCap>\r
-        </rollingPolicy>\r
-        <encoder>\r
-            <pattern>${pattern}</pattern>\r
-        </encoder>\r
-        <filter class="org.openecomp.fusionapp.util.CustomLoggingFilter" />\r
-    </appender>\r
-    <appender class="ch.qos.logback.classic.AsyncAppender" name="asyncEELF">\r
-        <queueSize>${queueSize}</queueSize>\r
-        <!-- Class name is part of caller data -->\r
-        <includeCallerData>true</includeCallerData>\r
-        <appender-ref ref="EELF" />\r
-    </appender>\r
-    <!-- EELF Security Appender. This appender is used to record security events\r
-    to the security log file. Security events are separate from other loggers\r
-    in EELF so that security log records can be captured and managed in a secure\r
-    way separate from the other logs. This appender is set to never discard any\r
-    events. -->\r
-    <!--\r
-  <appender name="EELFSecurity"\r
-    class="ch.qos.logback.core.rolling.RollingFileAppender">\r
-    <file>${logDirectory}/${securityLogName}.log</file>\r
-    <rollingPolicy\r
-      class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">\r
-      <fileNamePattern>${logDirectory}/${securityLogName}.%i.log.zip\r
-      </fileNamePattern>\r
-      <minIndex>1</minIndex>\r
-      <maxIndex>9</maxIndex>\r
-    </rollingPolicy>\r
-    <triggeringPolicy\r
-      class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">\r
-      <maxFileSize>5MB</maxFileSize>\r
-    </triggeringPolicy>\r
-    <encoder>\r
-      <pattern>${defaultPattern}</pattern>\r
-    </encoder>\r
-  </appender>\r
-\r
-  <appender name="asyncEELFSecurity" class="ch.qos.logback.classic.AsyncAppender">\r
-    <queueSize>256</queueSize>\r
-    <discardingThreshold>0</discardingThreshold>\r
-    <appender-ref ref="EELFSecurity" />\r
-  </appender>\r
-   -->\r
-    <!-- EELF Performance Appender. This appender is used to record performance\r
-    records. -->\r
-    <!--\r
-  <appender name="EELFPerformance"\r
-    class="ch.qos.logback.core.rolling.RollingFileAppender">\r
-    <file>${logDirectory}/${performanceLogName}.log</file>\r
-    <rollingPolicy\r
-      class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">\r
-      <fileNamePattern>${logDirectory}/${performanceLogName}.%i.log.zip\r
-      </fileNamePattern>\r
-      <minIndex>1</minIndex>\r
-      <maxIndex>9</maxIndex>\r
-    </rollingPolicy>\r
-    <triggeringPolicy\r
-      class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">\r
-      <maxFileSize>5MB</maxFileSize>\r
-    </triggeringPolicy>\r
-    <encoder>\r
-      <outputPatternAsHeader>true</outputPatternAsHeader>\r
-      <pattern>${defaultPattern}</pattern>\r
-    </encoder>\r
-  </appender>\r
-  <appender name="asyncEELFPerformance" class="ch.qos.logback.classic.AsyncAppender">\r
-    <queueSize>256</queueSize>\r
-    <appender-ref ref="EELFPerformance" />\r
-  </appender>\r
-  -->\r
-    <!-- EELF Server Appender. This appender is used to record Server related\r
-    logging events. The Server logger and appender are specializations of the\r
-    EELF application root logger and appender. This can be used to segregate Server\r
-    events from other components, or it can be eliminated to record these events\r
-    as part of the application root log. -->\r
-    <!--\r
-  <appender name="EELFServer"\r
-    class="ch.qos.logback.core.rolling.RollingFileAppender">\r
-    <file>${logDirectory}/${serverLogName}.log</file>\r
-    <rollingPolicy\r
-      class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">\r
-      <fileNamePattern>${logDirectory}/${serverLogName}.%i.log.zip\r
-      </fileNamePattern>\r
-      <minIndex>1</minIndex>\r
-      <maxIndex>9</maxIndex>\r
-    </rollingPolicy>\r
-    <triggeringPolicy\r
-      class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">\r
-      <maxFileSize>5MB</maxFileSize>\r
-    </triggeringPolicy>\r
-    <encoder>\r
-        <pattern>${defaultPattern}</pattern>\r
-    </encoder>\r
-  </appender>\r
-  <appender name="asyncEELFServer" class="ch.qos.logback.classic.AsyncAppender">\r
-    <queueSize>256</queueSize>\r
-    <appender-ref ref="EELFServer" />\r
-  </appender>\r
-   -->\r
-    <!-- EELF Policy Appender. This appender is used to record Policy engine\r
-    related logging events. The Policy logger and appender are specializations\r
-    of the EELF application root logger and appender. This can be used to segregate\r
-    Policy engine events from other components, or it can be eliminated to record\r
-    these events as part of the application root log. -->\r
-    <!--\r
-  <appender name="EELFPolicy"\r
-    class="ch.qos.logback.core.rolling.RollingFileAppender">\r
-    <file>${logDirectory}/${policyLogName}.log</file>\r
-    <rollingPolicy\r
-      class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">\r
-      <fileNamePattern>${logDirectory}/${policyLogName}.%i.log.zip\r
-      </fileNamePattern>\r
-      <minIndex>1</minIndex>\r
-      <maxIndex>9</maxIndex>\r
-    </rollingPolicy>\r
-    <triggeringPolicy\r
-      class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">\r
-      <maxFileSize>5MB</maxFileSize>\r
-    </triggeringPolicy>\r
-    <encoder>\r
-        <pattern>${defaultPattern}</pattern>\r
-    </encoder>\r
-  </appender>\r
-  <appender name="asyncEELFPolicy" class="ch.qos.logback.classic.AsyncAppender">\r
-    <queueSize>256</queueSize>\r
-    <appender-ref ref="EELFPolicy" />\r
-  </appender>\r
-  -->\r
-    <!-- EELF Audit Appender. This appender is used to record audit engine\r
-    related logging events. The audit logger and appender are specializations\r
-    of the EELF application root logger and appender. This can be used to segregate\r
-    Policy engine events from other components, or it can be eliminated to record\r
-    these events as part of the application root log. -->\r
-    <appender class="ch.qos.logback.core.rolling.RollingFileAppender" name="EELFAudit">\r
-        <file>${logDirectory}/${auditLogName}.log</file>\r
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">\r
-            <!-- daily rollover -->\r
-            <fileNamePattern>${logDirectory}/${auditLogName}.%d{yyyy-MM-dd}.%i.log</fileNamePattern>\r
-            <!-- keep 30 days' worth of history capped at ${totalSizeCap} total size -->\r
-            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">\r
-                <maxFileSize>${maxFileSize}</maxFileSize>\r
-            </timeBasedFileNamingAndTriggeringPolicy>\r
-            <maxHistory>${maxHistory}</maxHistory>\r
-            <totalSizeCap>${totalSizeCap}</totalSizeCap>\r
-        </rollingPolicy>\r
-        <encoder>\r
-            <pattern>${pattern}</pattern>\r
-        </encoder>\r
-    </appender>\r
-    <appender class="ch.qos.logback.classic.AsyncAppender" name="asyncEELFAudit">\r
-        <queueSize>${queueSize}</queueSize>\r
-        <appender-ref ref="EELFAudit" />\r
-    </appender>\r
-    <appender class="ch.qos.logback.core.rolling.RollingFileAppender" name="EELFMetrics">\r
-        <file>${logDirectory}/${metricsLogName}.log</file>\r
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">\r
-            <!-- daily rollover -->\r
-            <fileNamePattern>${logDirectory}/${metricsLogName}.%d{yyyy-MM-dd}.%i.log</fileNamePattern>\r
-            <!-- keep 30 days' worth of history capped at ${totalSizeCap} total size -->\r
-            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">\r
-                <maxFileSize>${maxFileSize}</maxFileSize>\r
-            </timeBasedFileNamingAndTriggeringPolicy>\r
-            <maxHistory>${maxHistory}</maxHistory>\r
-            <totalSizeCap>${totalSizeCap}</totalSizeCap>\r
-        </rollingPolicy>\r
-        <encoder>\r
-            <pattern>${pattern}</pattern>\r
-        </encoder>\r
-    </appender>\r
-    <appender class="ch.qos.logback.classic.AsyncAppender" name="asyncEELFMetrics">\r
-        <queueSize>${queueSize}</queueSize>\r
-        <appender-ref ref="EELFMetrics" />\r
-    </appender>\r
-    <appender class="ch.qos.logback.core.rolling.RollingFileAppender" name="EELFError">\r
-        <file>${logDirectory}/${errorLogName}.log</file>\r
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">\r
-            <!-- daily rollover -->\r
-            <fileNamePattern>${logDirectory}/${errorLogName}.%d{yyyy-MM-dd}.%i.log</fileNamePattern>\r
-            <!-- keep 30 days' worth of history capped at ${totalSizeCap} total size -->\r
-            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">\r
-                <maxFileSize>${maxFileSize}</maxFileSize>\r
-            </timeBasedFileNamingAndTriggeringPolicy>\r
-            <maxHistory>${maxHistory}</maxHistory>\r
-            <totalSizeCap>${totalSizeCap}</totalSizeCap>\r
-        </rollingPolicy>\r
-        <encoder>\r
-            <pattern>${pattern}</pattern>\r
-        </encoder>\r
-    </appender>\r
-    <appender class="ch.qos.logback.classic.AsyncAppender" name="asyncEELFError">\r
-        <queueSize>${queueSize}</queueSize>\r
-        <appender-ref ref="EELFError" />\r
-    </appender>\r
-    <appender class="ch.qos.logback.core.rolling.RollingFileAppender" name="EELFDebug">\r
-        <file>${debugLogDirectory}/${debugLogName}.log</file>\r
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">\r
-            <!-- daily rollover -->\r
-            <fileNamePattern>${logDirectory}/${debugLogName}.%d{yyyy-MM-dd}.%i.log</fileNamePattern>\r
-            <!-- keep 30 days' worth of history capped at ${totalSizeCap} total size -->\r
-            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">\r
-                <maxFileSize>${maxFileSize}</maxFileSize>\r
-            </timeBasedFileNamingAndTriggeringPolicy>\r
-            <maxHistory>${maxHistory}</maxHistory>\r
-            <totalSizeCap>${totalSizeCap}</totalSizeCap>\r
-        </rollingPolicy>\r
-        <encoder>\r
-            <pattern>${pattern}</pattern>\r
-        </encoder>\r
-    </appender>\r
-    <appender class="ch.qos.logback.classic.AsyncAppender" name="asyncEELFDebug">\r
-        <queueSize>${queueSize}</queueSize>\r
-        <appender-ref ref="EELFDebug" />\r
-    </appender>\r
-    <!-- ============================================================================ -->\r
-    <!--  EELF loggers -->\r
-    <!-- ============================================================================ -->\r
-    <logger additivity="false" level="debug" name="com.att.eelf">\r
-        <appender-ref ref="asyncEELF" />\r
-    </logger>\r
-    <!--\r
-  <logger name="com.att.eelf.security" level="info" additivity="false">\r
-    <appender-ref ref="asyncEELFSecurity" />\r
-  </logger>\r
-  <logger name="com.att.eelf.perf" level="info" additivity="false">\r
-    <appender-ref ref="asyncEELFPerformance" />\r
-  </logger>\r
-  <logger name="com.att.eelf.server" level="info" additivity="false">\r
-   <appender-ref ref="asyncEELFServer" />\r
-  </logger>\r
-  <logger name="com.att.eelf.policy" level="info" additivity="false">\r
-    <appender-ref ref="asyncEELFPolicy" />\r
-  </logger>\r
-  -->\r
-    <logger additivity="false" level="info" name="com.att.eelf.audit">\r
-        <appender-ref ref="asyncEELFAudit" />\r
-    </logger>\r
-    <logger additivity="false" level="info" name="com.att.eelf.metrics">\r
-        <appender-ref ref="asyncEELFMetrics" />\r
-    </logger>\r
-    <logger additivity="false" level="info" name="com.att.eelf.error">\r
-        <appender-ref ref="asyncEELFError" />\r
-    </logger>\r
-    <logger additivity="false" level="debug" name="com.att.eelf.debug">\r
-        <appender-ref ref="asyncEELFDebug" />\r
-    </logger>\r
-    <root level="DEBUG">\r
-        <appender-ref ref="asyncEELF" />\r
-    </root>\r
-</configuration>
\ No newline at end of file

diff --git a/kubernetes/portal/templates/portal-mariadb-deployment.yaml b/kubernetes/portal/templates/portal-mariadb-deployment.yaml
index 96084e5..fafcad2 100755 (executable)
--- a/kubernetes/portal/templates/portal-mariadb-deployment.yaml
+++ b/kubernetes/portal/templates/portal-mariadb-deployment.yaml
@@ -29,10 +29,6 @@ spec:
           readOnly: true
         - mountPath: /var/lib/mysql
           name: portal-mariadb-data
-        - mountPath: /var/log/onap
-          name: portal-logs
-        - mountPath: /tmp/logback.xml
-          name: portal-logback
         ports:
         - containerPort: 3306
           name: portaldb
@@ -41,16 +37,6 @@ spec:
             port: 3306
           initialDelaySeconds: 5
           periodSeconds: 10
-      - image: {{ .Values.image.filebeat }}
-        imagePullPolicy: {{ .Values.pullPolicy }}
-        name: filebeat-onap
-        volumeMounts:
-        - mountPath: /usr/share/filebeat/filebeat.yml
-          name: filebeat-conf
-        - mountPath: /var/log/onap
-          name: portal-logs
-        - mountPath: /usr/share/filebeat/data
-          name: portal-data-filebeat
       volumes:
       - name: localtime
         hostPath:
@@ -58,16 +44,6 @@ spec:
       - name: portal-mariadb-data
         persistentVolumeClaim:
           claimName: portal-db
-      - name: filebeat-conf
-        hostPath:
-          path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/filebeat/logback/filebeat.yml
-      - name: portal-logs
-        emptyDir: {}
-      - name: portal-data-filebeat
-        emptyDir: {}
-      - name: portal-logback
-        hostPath:
-          path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/portal/portal-db/logback.xml
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
-#{{ end }}
\ No newline at end of file
+#{{ end }}