Merge pull request #10 from sashaPM/master

analytics and netviz updates
CiscoDevNet · Jun 11, 2019 · 192dca6 · 192dca6
2 parents db64168 + f132904
commit 192dca6
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 8 deletions.
diff --git a/appd-machine-agent-analytics/Dockerfile b/appd-machine-agent-analytics/Dockerfile
@@ -1,5 +1,5 @@
 
-FROM openjdk:8-jre-slim AS builder
+FROM openjdk:8u151-jre-alpine3.7 AS builder
 
 MAINTAINER mark.prichard@appdynamics.com
 
@@ -17,8 +17,10 @@ RUN if [ "x${APPD_AGENT_SHA256}" != "x" ]; then \
     fi
 
 
-FROM openjdk:8-jre-slim
-RUN apt-get update && apt-get -y upgrade && apt-get install -y unzip bash gawk sed grep bc coreutils && apt-get install -y apt-utils && apt-get install -y iproute2 && apt-get install -y procps && apt-get install -y sysstat
+FROM openjdk:8u151-jre-alpine3.7
+RUN apk add --no-cache iproute2 procps sysstat dumb-init bash coreutils sed
+
+
 COPY --from=builder /tmp /opt/appdynamics
 
 ENV MACHINE_AGENT_HOME /opt/appdynamics

diff --git a/appd-machine-agent-analytics/deploy/machine-agent-sec.yaml b/appd-machine-agent-analytics/deploy/machine-agent-sec.yaml
@@ -3,7 +3,6 @@ kind: DaemonSet
 metadata: 
   name: appd-infra-agent
 spec: 
-  replicas: 1
   template: 
     metadata: 
       labels: 

diff --git a/appd-machine-agent-analytics/deploy/machine-agent.yaml b/appd-machine-agent-analytics/deploy/machine-agent.yaml
@@ -3,7 +3,6 @@ kind: DaemonSet
 metadata: 
   name: appd-infra-agent
 spec: 
-  replicas: 1
   template: 
     metadata: 
       labels: 

diff --git a/appd-machine-agent-analytics/updateAnalyticsAgent.sh b/appd-machine-agent-analytics/updateAnalyticsAgent.sh
@@ -1,10 +1,13 @@
 ANALYTICS_AGENT_PROPERTIES="${1}/monitors/analytics-agent/conf/analytics-agent.properties"
+ANALYTICS_AGENT_CONFIG="${1}/monitors/analytics-agent/monitor.xml"
 
 replaceText () {
 
 	sed -i "s|$1|$2|g" $3
 }
 
+sed -i 's/false/true/g' $ANALYTICS_AGENT_CONFIG
+
 PROTOCOL="http"
 
 if [ "${APPDYNAMICS_CONTROLLER_SSL_ENABLED}" = "true" ]; then

diff --git a/appd-machine-agent-netviz/Dockerfile b/appd-machine-agent-netviz/Dockerfile
@@ -19,7 +19,12 @@ RUN if [ "x${APPD_AGENT_SHA256}" != "x" ]; then \
 
 FROM openjdk:8-jre-slim
 
-RUN apt-get update && apt-get -y upgrade && apt-get install -y unzip bash gawk sed grep bc coreutils && apt-get install -y apt-utils && apt-get install -y iproute2 && apt-get install -y procps && apt-get install -y sysstat && apt-get install -y net-tools tcpdump curl sysvinit-utils openssh-client
+RUN apt-get update && apt-get -y upgrade && apt-get install -y unzip bash gawk sed grep bc coreutils && apt-get install -y apt-utils && apt-get install -y iproute2 && apt-get install -y procps && apt-get install -y sysstat && apt-get install -y net-tools tcpdump curl sysvinit-utils openssh-client && rm -rf /var/lib/apt/lists/*
+
+RUN apt-get clean autoclean
+RUN apt-get autoremove --yes
+RUN rm -rf /var/lib/{apt,dpkg,cache,log}/
+
 COPY --from=builder /tmp /opt/appdynamics
 
 ENV MACHINE_AGENT_HOME /opt/appdynamics

diff --git a/appd-machine-agent-netviz/deploy/machine-agent.yaml b/appd-machine-agent-netviz/deploy/machine-agent.yaml
@@ -3,13 +3,12 @@ kind: DaemonSet
 metadata: 
   name: appd-infra-agent
 spec: 
-  replicas: 1
   template: 
     metadata: 
       labels: 
         name: appd-infra-agent
     spec:
-      serviceAccountName: appd-infra-sa
+      serviceAccountName: appdynamics-infraviz
       hostIPC: true
       hostNetwork: true
       containers:

diff --git a/appd-machine-agent-netviz/updateAnalyticsAgent.sh b/appd-machine-agent-netviz/updateAnalyticsAgent.sh
@@ -1,10 +1,13 @@
 ANALYTICS_AGENT_PROPERTIES="${1}/monitors/analytics-agent/conf/analytics-agent.properties"
+ANALYTICS_AGENT_CONFIG="${1}/monitors/analytics-agent/monitor.xml"
 
 replaceText () {
 
 	sed -i "s|$1|$2|g" $3
 }
 
+sed -i 's/false/true/g' $ANALYTICS_AGENT_CONFIG
+
 PROTOCOL="http"
 
 if [ "${APPDYNAMICS_CONTROLLER_SSL_ENABLED}" = "true" ]; then