From 903116ae639871a072876c2bb0a93d5060a70e04 Mon Sep 17 00:00:00 2001 From: Mandar Sawant Date: Wed, 16 Sep 2020 22:30:26 -0500 Subject: [PATCH 1/3] updating INFO.yaml to remove past committers Issue-ID: DMAAP-1486 Change-Id: I1d48372bffe502845d43d490d99b433253a19f77 Signed-off-by: Mandar Sawant --- INFO.yaml | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/INFO.yaml b/INFO.yaml index f204084..b9906e5 100644 --- a/INFO.yaml +++ b/INFO.yaml @@ -28,16 +28,7 @@ meetings: repeats: 'weekly' time: '13:00 UTC' repositories: - - 'dmaap-buscontroller' - - 'dmaap-datarouter' - - 'dmaap-dbcapi' - - 'dmaap-kafka11aaf' - - 'dmaap-messagerouter-dmaapclient' - - 'dmaap-messagerouter-messageservice' - - 'dmaap-messagerouter-mirroragent' - - 'dmaap-messagerouter-msgrtr' - - 'dmaap-oom' - - 'dmaap-zookeeper' + - 'dmaap/messagerouter/mirroragent' committers: - <<: *onap_releng_ptl - name: 'Mandar Sawant' @@ -60,22 +51,23 @@ committers: company: 'ATT' id: 'su622b' timezone: 'America/Louisville' - - name: 'Conor Ward' - email: 'conor.ward@ericsson.com' - company: 'ericsson' - id: 'econwar' - timezone: 'Europe/Dublin' - name: 'Fiachra Corcoran' email: 'fiachra.corcoran@est.tech' company: 'ericsson' id: 'efiacor' - timezone: 'Europe/Dublin' + timezone: 'Europe/Dublin' tsc: approval: 'https://lists.onap.org/pipermail/onap-tsc' changes: - type: 'Removal' name: 'Habib Madani' + - type: 'Removal' name: 'Xinhui Li' + - type: 'Removal' name: 'Jing Wang' + - type: 'Removal' name: 'Ramdas Sawant' + - type: 'Removal' name: 'Varun Gudisena' + - type: 'Removal' + name: 'Conor Ward' -- 2.16.6 From d899337fa9c9df051c2383df0efc3cfc5bf952fb Mon Sep 17 00:00:00 2001 From: ajay_dp001 Date: Wed, 27 Jan 2021 16:29:43 +0530 Subject: [PATCH 2/3] [DMaap-mirroragent] Updated Log4j Version 1.2.17 to 2.13.3 Issue-ID: DMAAP-1515 Signed-off-by: ajay_dp001 Change-Id: Ie16d8aeb9cde9e7831b0301485a2aefbca7cd765 --- pom.xml | 12 ++++-- .../dmaap/mr/dmaapMMAgent/MirrorMakerAgent.java | 11 +++-- .../org/onap/dmaap/mr/dmaapMMAgent/TopicUtil.java | 11 +++-- .../utils/MirrorMakerProcessHandler.java | 6 +-- src/main/resources/log4j.properties | 37 ----------------- src/main/resources/log4j2.properties | 47 ++++++++++++++++++++++ 6 files changed, 69 insertions(+), 55 deletions(-) delete mode 100644 src/main/resources/log4j.properties create mode 100644 src/main/resources/log4j2.properties diff --git a/pom.xml b/pom.xml index 9afc28c..6c53e7b 100644 --- a/pom.xml +++ b/pom.xml @@ -39,6 +39,7 @@ UTF-8 + 2.13.3 https://nexus.onap.org java @@ -106,9 +107,14 @@ 2.6.2 - log4j - log4j - 1.2.17 + org.apache.logging.log4j + log4j-api + ${log4j.version} + + + org.apache.logging.log4j + log4j-core + ${log4j.version} org.jasypt diff --git a/src/main/java/org/onap/dmaap/mr/dmaapMMAgent/MirrorMakerAgent.java b/src/main/java/org/onap/dmaap/mr/dmaapMMAgent/MirrorMakerAgent.java index 9af3809..f47adfb 100644 --- a/src/main/java/org/onap/dmaap/mr/dmaapMMAgent/MirrorMakerAgent.java +++ b/src/main/java/org/onap/dmaap/mr/dmaapMMAgent/MirrorMakerAgent.java @@ -21,6 +21,8 @@ *******************************************************************************/ package org.onap.dmaap.mr.dmaapMMAgent; +import com.google.gson.Gson; +import com.google.gson.internal.LinkedTreeMap; import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; @@ -29,8 +31,8 @@ import java.io.InputStream; import java.io.OutputStream; import java.util.ArrayList; import java.util.Properties; - -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.jasypt.util.text.BasicTextEncryptor; import org.json.JSONObject; import org.onap.dmaap.mr.dmaapMMAgent.dao.CreateMirrorMaker; @@ -41,11 +43,8 @@ import org.onap.dmaap.mr.dmaapMMAgent.dao.UpdateMirrorMaker; import org.onap.dmaap.mr.dmaapMMAgent.dao.UpdateWhiteList; import org.onap.dmaap.mr.dmaapMMAgent.utils.MirrorMakerProcessHandler; -import com.google.gson.Gson; -import com.google.gson.internal.LinkedTreeMap; - public class MirrorMakerAgent { - static final Logger logger = Logger.getLogger(MirrorMakerAgent.class); + private static final Logger logger = LogManager.getLogger(MirrorMakerAgent.class); Properties mirrorMakerProperties = new Properties(); ListMirrorMaker mirrorMakers = null; String mmagenthome = "/opt"; diff --git a/src/main/java/org/onap/dmaap/mr/dmaapMMAgent/TopicUtil.java b/src/main/java/org/onap/dmaap/mr/dmaapMMAgent/TopicUtil.java index e2dc0ef..85a6bcd 100644 --- a/src/main/java/org/onap/dmaap/mr/dmaapMMAgent/TopicUtil.java +++ b/src/main/java/org/onap/dmaap/mr/dmaapMMAgent/TopicUtil.java @@ -22,21 +22,20 @@ package org.onap.dmaap.mr.dmaapMMAgent; +import com.google.gson.Gson; +import com.sun.org.apache.xerces.internal.impl.dv.util.Base64; import java.io.BufferedReader; import java.io.DataOutputStream; import java.io.InputStream; import java.io.InputStreamReader; import java.net.HttpURLConnection; import java.net.URL; - -import org.apache.log4j.Logger; - -import com.google.gson.Gson; -import com.sun.org.apache.xerces.internal.impl.dv.util.Base64; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; public class TopicUtil { - static final Logger logger = Logger.getLogger(TopicUtil.class); + private static final Logger logger = LogManager.getLogger(TopicUtil.class); public String publishTopic(String topicURL, String topicname, String mechid, String password, String message) { try { diff --git a/src/main/java/org/onap/dmaap/mr/dmaapMMAgent/utils/MirrorMakerProcessHandler.java b/src/main/java/org/onap/dmaap/mr/dmaapMMAgent/utils/MirrorMakerProcessHandler.java index 883d151..625fbc8 100644 --- a/src/main/java/org/onap/dmaap/mr/dmaapMMAgent/utils/MirrorMakerProcessHandler.java +++ b/src/main/java/org/onap/dmaap/mr/dmaapMMAgent/utils/MirrorMakerProcessHandler.java @@ -24,11 +24,11 @@ package org.onap.dmaap.mr.dmaapMMAgent.utils; import java.io.BufferedReader; import java.io.InputStream; import java.io.InputStreamReader; - -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; public class MirrorMakerProcessHandler { - static final Logger logger = Logger.getLogger(MirrorMakerProcessHandler.class); + private static final Logger logger = LogManager.getLogger(MirrorMakerProcessHandler.class); static String mmagenthome = "/opt"; public static boolean checkMirrorMakerProcess(String agentname, boolean enablelogCheck, String grepLog) throws Exception { diff --git a/src/main/resources/log4j.properties b/src/main/resources/log4j.properties deleted file mode 100644 index 9225695..0000000 --- a/src/main/resources/log4j.properties +++ /dev/null @@ -1,37 +0,0 @@ -############################################################################### -# ============LICENSE_START======================================================= -# org.onap.dmaap -# ================================================================================ -# Copyright © 2017 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. -# -############################################################################### -# Root logger option -log4j.rootLogger=INFO, stdout, file - -# Redirect log messages to console -log4j.appender.stdout=org.apache.log4j.ConsoleAppender -log4j.appender.stdout.Target=System.out -log4j.appender.stdout.layout=org.apache.log4j.PatternLayout -log4j.appender.stdout.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %-5p - %m %n - -# Redirect log messages to a log file, support file rolling. -log4j.appender.file=org.apache.log4j.RollingFileAppender -log4j.appender.file.File= /opt/logs/mmagent.log -log4j.appender.file.MaxFileSize=5MB -log4j.appender.file.MaxBackupIndex=10 -log4j.appender.file.layout=org.apache.log4j.PatternLayout -log4j.appender.file.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %-5p - %m %n \ No newline at end of file diff --git a/src/main/resources/log4j2.properties b/src/main/resources/log4j2.properties new file mode 100644 index 0000000..9432e1d --- /dev/null +++ b/src/main/resources/log4j2.properties @@ -0,0 +1,47 @@ +### +# ============LICENSE_START======================================================= +# Copyright (C) 2021 Nordix Foundation. +# ================================================================================ +# 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. +# +# SPDX-License-Identifier: Apache-2.0 +# ============LICENSE_END========================================================= +### + +# Log4j2 PropertiesConfig +status = info +name = PropertiesConfig + +# Console Appender +appender.console.type = Console +appender.console.name = STDOUT +appender.console.layout.type = PatternLayout +appender.console.layout.pattern = %d{yyyy-MM-dd HH:mm:ss} %-5p - %m %n + +# Rolling Appender +appender.rolling.type = RollingFile +appender.rolling.name = rollingFile +appender.rolling.fileName = /opt/logs/mmagent.log +appender.rolling.filePattern = /opt/logs/$${date:yyyy-MM-dd}/mmagent-%d{yyyy-MM-dd}-%i.log +appender.rolling.layout.type = PatternLayout +appender.rolling.layout.pattern = %d{yyyy-MM-dd HH:mm:ss} %-5p - %m %n +appender.rolling.policies.type = Policies +appender.rolling.policies.size.type = SizeBasedTriggeringPolicy +appender.rolling.policies.size.size=5MB +appender.rolling.strategy.type = DefaultRolloverStrategy +appender.rolling.strategy.max = 10 + +# Root Logger +rootLogger.level = info +rootLogger.appenderRef.stdout.ref = STDOUT +rootLogger.appenderRef.rolling.ref = rollingFile \ No newline at end of file -- 2.16.6 From 2d493f8b8e61f70108a8c5276144feb8be397c14 Mon Sep 17 00:00:00 2001 From: efiacor Date: Thu, 25 Feb 2021 15:33:24 +0000 Subject: [PATCH 3/3] [DMAAP MM] Update info.yaml Signed-off-by: efiacor Change-Id: I5b5315e700803a8fc82fd5fe7b403a6d31bcb062 Issue-ID: DMAAP-1538 --- INFO.yaml | 111 +++++++++++++++++++++++++++++--------------------------------- 1 file changed, 51 insertions(+), 60 deletions(-) diff --git a/INFO.yaml b/INFO.yaml index b9906e5..7566429 100644 --- a/INFO.yaml +++ b/INFO.yaml @@ -1,73 +1,64 @@ --- project: 'dmaap-messagerouter-mirroragent' project_creation_date: '2017-08-29' -lifecycle_state: 'Incubation' +lifecycle_state: 'Mature' project_lead: &onap_releng_ptl - name: 'Mandar Sawant' - email: 'ms5838@att.com' - id: 'sawantmandar' - company: 'ATT' - timezone: 'America/Dallas' + name: 'Fiachra Corcoran' + email: 'fiachra.corcoran@est.tech' + company: 'ericsson' + id: 'efiacor' + timezone: 'Europe/Dublin' primary_contact: *onap_releng_ptl project_category: '' issue_tracking: - type: 'jira' - url: 'https://jira.onap.org/projects/DMAAP' - key: 'DMAAP' + type: 'jira' + url: 'https://jira.onap.org/projects/DMAAP' + key: 'DMAAP' mailing_list: - type: 'groups.io' - url: 'lists.onap.org' - tag: '<[sub-project_name]>' + type: 'groups.io' + url: 'lists.onap.org' + tag: '<[sub-project_name]>' realtime_discussion: '' meetings: - - type: 'zoom' - agenda: '' - url: 'https://wiki.onap.org/pages/viewpage.action?pageId=13599275' - server: 'n/a' - channel: 'n/a' - repeats: 'weekly' - time: '13:00 UTC' + - type: 'zoom' + agenda: '' + url: 'https://wiki.onap.org/pages/viewpage.action?pageId=13599275' + server: 'n/a' + channel: 'n/a' + repeats: 'weekly' + time: '15:30 UTC' repositories: - - 'dmaap/messagerouter/mirroragent' + - 'dmaap/messagerouter/mirroragent' committers: - - <<: *onap_releng_ptl - - name: 'Mandar Sawant' - email: 'ms5838@att.com' - company: 'ATT' - id: 'sawantmandar' - timezone: 'America/Dallas' - - name: 'Bhanu Ramesh' - email: 'bg6954@att.com' - company: 'ATT' - id: 'BhanuRamesh' - timezone: 'America/Dallas' - - name: 'Dominic Lunanuova' - email: 'dgl@research.att.com' - company: 'ATT' - id: 'dglFromAtt' - timezone: 'America/Dallas' - - name: 'Sunil Unnava' - email: 'su622b@att.com' - company: 'ATT' - id: 'su622b' - timezone: 'America/Louisville' - - name: 'Fiachra Corcoran' - email: 'fiachra.corcoran@est.tech' - company: 'ericsson' - id: 'efiacor' - timezone: 'Europe/Dublin' + - <<: *onap_releng_ptl + - name: 'Fiachra Corcoran' + email: 'fiachra.corcoran@est.tech' + company: 'ericsson' + id: 'efiacor' + timezone: 'Europe/Dublin' + - name: 'Dominic Lunanuova' + email: 'dgl@research.att.com' + company: 'ATT' + id: 'dglFromAtt' + timezone: 'America/Dallas' tsc: - approval: 'https://lists.onap.org/pipermail/onap-tsc' - changes: - - type: 'Removal' - name: 'Habib Madani' - - type: 'Removal' - name: 'Xinhui Li' - - type: 'Removal' - name: 'Jing Wang' - - type: 'Removal' - name: 'Ramdas Sawant' - - type: 'Removal' - name: 'Varun Gudisena' - - type: 'Removal' - name: 'Conor Ward' + approval: 'https://lists.onap.org/pipermail/onap-tsc' + changes: + - type: 'Removal' + name: 'Habib Madani' + - type: 'Removal' + name: 'Xinhui Li' + - type: 'Removal' + name: 'Jing Wang' + - type: 'Removal' + name: 'Ramdas Sawant' + - type: 'Removal' + name: 'Varun Gudisena' + - type: 'Removal' + name: 'Conor Ward' + - type: 'Removal' + name: 'Sunil Unnava' + - type: 'Removal' + name: 'Bhanu Ramesh' + - type: 'Removal' + name: 'Mandar Sawant' -- 2.16.6