From 07c8a9bb1762acd3047de441e3f5520167d4a81f Mon Sep 17 00:00:00 2001 From: Sergio Garcia Date: Wed, 11 Mar 2026 13:47:20 +0100 Subject: [PATCH] Cleanup old images --- chronos/Dockerfile | 7 --- chronos/run.sh | 3 -- logstash-to-monalisa/Dockerfile | 10 ---- logstash-to-monalisa/jenkins.conf | 61 ------------------------ logstash-to-monalisa/logstash.repo | 6 --- logstash-to-monalisa/mesos-patterns.conf | 3 -- logstash-to-monalisa/mesos.conf | 54 --------------------- logstash-to-monalisa/processes.conf | 22 --------- logstash-to-monalisa/run.sh | 13 ----- logstash/Dockerfile | 12 ----- logstash/jenkins.conf | 61 ------------------------ logstash/logstash.repo | 6 --- logstash/mesos-patterns.conf | 3 -- logstash/mesos.conf | 54 --------------------- logstash/processes.conf | 22 --------- logstash/run.sh | 35 -------------- redis/Dockerfile | 1 - zookeeper/Dockerfile | 15 ------ zookeeper/run.sh | 44 ----------------- 19 files changed, 432 deletions(-) delete mode 100644 chronos/Dockerfile delete mode 100644 chronos/run.sh delete mode 100644 logstash-to-monalisa/Dockerfile delete mode 100644 logstash-to-monalisa/jenkins.conf delete mode 100644 logstash-to-monalisa/logstash.repo delete mode 100644 logstash-to-monalisa/mesos-patterns.conf delete mode 100644 logstash-to-monalisa/mesos.conf delete mode 100644 logstash-to-monalisa/processes.conf delete mode 100644 logstash-to-monalisa/run.sh delete mode 100644 logstash/Dockerfile delete mode 100644 logstash/jenkins.conf delete mode 100644 logstash/logstash.repo delete mode 100644 logstash/mesos-patterns.conf delete mode 100644 logstash/mesos.conf delete mode 100644 logstash/processes.conf delete mode 100755 logstash/run.sh delete mode 100644 redis/Dockerfile delete mode 100644 zookeeper/Dockerfile delete mode 100644 zookeeper/run.sh diff --git a/chronos/Dockerfile b/chronos/Dockerfile deleted file mode 100644 index 5219242..0000000 --- a/chronos/Dockerfile +++ /dev/null @@ -1,7 +0,0 @@ -FROM alisw/mesos-base:0.23.0-cc7 - -RUN yum update -y && yum -y install chronos - -COPY run.sh /run.sh - -CMD sh -ex /run.sh diff --git a/chronos/run.sh b/chronos/run.sh deleted file mode 100644 index d2ed950..0000000 --- a/chronos/run.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -ex -export MESOS_NATIVE_JAVA_LIBRARY=/usr/local/lib/libmesos.so -java -cp /usr/bin/chronos org.apache.mesos.chronos.scheduler.Main --master zk://leader.mesos:2181/mesos --zk_hosts leader.mesos:2181 diff --git a/logstash-to-monalisa/Dockerfile b/logstash-to-monalisa/Dockerfile deleted file mode 100644 index f3ecfd4..0000000 --- a/logstash-to-monalisa/Dockerfile +++ /dev/null @@ -1,10 +0,0 @@ -FROM centos:centos7 - -ADD logstash.repo /etc/yum.repos.d/logstash.repo -RUN yum update -y && yum install -y logstash which java-1.8.0-openjdk-headless git - -ADD mesos-patterns.conf /opt/logstash/patterns/mesos -ADD run.sh / -RUN /opt/logstash/bin/plugin install logstash-input-http_poller - -CMD /usr/bin/java -version && sh -e -x /run.sh diff --git a/logstash-to-monalisa/jenkins.conf b/logstash-to-monalisa/jenkins.conf deleted file mode 100644 index 67190b4..0000000 --- a/logstash-to-monalisa/jenkins.conf +++ /dev/null @@ -1,61 +0,0 @@ -input { - file { - path => "/var/log/jenkins/jenkins.log" - start_position => "beginning" - } -} - -filter { - mutate { - add_field => ["@message_type", "jenkins"] - add_field => ["@message", "%{message}"] - } - - multiline { - pattern => "^%{MONTH} %{MONTHDAY}, %{YEAR} %{TIME} (AM|PM)" - negate => true - what => "previous" - } - - mutate { - join => ["@message", "\n"] - } - - grok { - match => [ "@message", "^(?<__date>%{MONTH} %{MONTHDAY}, %{YEAR} %{TIME} (AM|PM)) (?<__msg>.+)" ] - } - date { - match => [ "__date", - "MMM dd, YYYY HH:mm:ss a" - ] - timezone => "CET" - } - grok { - match => ["__msg", "(?[A-Za-z0-9._]+) (?[A-Za-z0-9._]+)\\n(?[^:]+): (?.*)"] - } - - # Lastly, clean-up temporary fields and unwanted tags. - mutate { - remove_field => [ - "message", - "@message", - "__msg", - "__date", - "path" - ] - remove_tag => [ - "multiline", - "_grokparsefailure" - ] - lowercase => [ - "severity" - ] - } -} -output { - elasticsearch_http { - host => "@ES_HOSTNAME@" - port => "@ES_PORT@" - index => "jenkins-logs-%{severity}-%{+YYYY.MM.dd}" - } -} diff --git a/logstash-to-monalisa/logstash.repo b/logstash-to-monalisa/logstash.repo deleted file mode 100644 index e4e5d82..0000000 --- a/logstash-to-monalisa/logstash.repo +++ /dev/null @@ -1,6 +0,0 @@ -[logstash-1.5] -name=logstash repository for 1.5.x packages -baseurl=http://packages.elasticsearch.org/logstash/1.5/centos -gpgcheck=1 -gpgkey=http://packages.elasticsearch.org/GPG-KEY-elasticsearch -enabled=1 diff --git a/logstash-to-monalisa/mesos-patterns.conf b/logstash-to-monalisa/mesos-patterns.conf deleted file mode 100644 index f227b63..0000000 --- a/logstash-to-monalisa/mesos-patterns.conf +++ /dev/null @@ -1,3 +0,0 @@ -LOGLEVEL [I,E,W,F] -MESOSTIMESTAMP %{MONTHNUM}%{MONTHDAY} %{HOUR}:%{MINUTE}:%{SECOND} -MESOSLOG %{LOGLEVEL:loglevel}%{MESOSTIMESTAMP:timestamp}[ ]+%{POSINT:threadid} %{GREEDYDATA:file}:%{POSINT:line}] %{GREEDYDATA:msg} diff --git a/logstash-to-monalisa/mesos.conf b/logstash-to-monalisa/mesos.conf deleted file mode 100644 index c2c3389..0000000 --- a/logstash-to-monalisa/mesos.conf +++ /dev/null @@ -1,54 +0,0 @@ -input { - file { - path => "/var/log/mesos/mesos-master.INFO" - start_position => "beginning" - } - file { - path => "/var/log/mesos/mesos-master.WARNING" - start_position => "beginning" - } - file { - path => "/var/log/mesos/mesos-master.ERROR" - start_position => "beginning" - } -} - -filter { - - grok { - - match => { "message" => "%{MESOSLOG}" } - - } - - mutate { - - gsub => [ - - # make the logTimestamp sortable. otherwise, date filter will break. - - "timestamp", " ", ";" - - ] - - } - - date { - - match => ["timestamp", "MMdd;HH:mm:ss.SSSSSS"] - - } - - mutate { - remove_field => ["timestamp"] - lowercase => ["loglevel"] - } -} - -output { - elasticsearch_http { - host => "@ES_HOSTNAME@" - port => "@ES_PORT@" - index => "mesos-logs-%{loglevel}-%{+YYYY.MM.dd}" - } -} diff --git a/logstash-to-monalisa/processes.conf b/logstash-to-monalisa/processes.conf deleted file mode 100644 index 9f40585..0000000 --- a/logstash-to-monalisa/processes.conf +++ /dev/null @@ -1,22 +0,0 @@ -input { - exec { - command => "find /host/proc/*/ -maxdepth 1 -type f -name stat -exec cat {} \;" - interval => 100 - codec => line {} - } -} - -filter { - mutate { - split => ["message", " "] - add_field => ["comm", "%{message[1]}"] - add_field => ["vsize", "%{message[22]}"] - add_field => ["rss", "%{message[23]}"] - add_field => ["utime", "%{message[13]}"] - add_field => ["stime", "%{message[14]}"] - add_field => ["cutime", "%{message[15]}"] - add_field => ["cstime", "%{message[16]}"] - add_field => ["num_threads", "%{message[19]}"] - remove_field => ["message", "command"] - } -} diff --git a/logstash-to-monalisa/run.sh b/logstash-to-monalisa/run.sh deleted file mode 100644 index edf3bb1..0000000 --- a/logstash-to-monalisa/run.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh -ex -REPO=${LOGSTASH_REPO-alisw} - -git clone https://github.com/$REPO/ali-bot - -perl -p -i -e "s/MONALISA_HOST/$MONALISA_HOST/" /ali-bot/logstash/to_monalisa.conf -perl -p -i -e "s/MONALISA_PORT/$MONALISA_PORT/" /ali-bot/logstash/to_monalisa.conf - -if [ ! "X$DEBUG" = X ]; then - echo 'output {stdout { codec => rubydebug }}' >> /ali-bot/logstash/to_monalisa.conf -fi - -/opt/logstash/bin/logstash -f /ali-bot/logstash/to_monalisa.conf diff --git a/logstash/Dockerfile b/logstash/Dockerfile deleted file mode 100644 index f0a9ab7..0000000 --- a/logstash/Dockerfile +++ /dev/null @@ -1,12 +0,0 @@ -FROM centos:centos7 - -ADD logstash.repo /etc/yum.repos.d/logstash.repo -RUN yum update -y && yum install -y logstash which java-1.8.0-openjdk-headless git - -ADD mesos-patterns.conf /opt/logstash/patterns/mesos -RUN /opt/logstash/bin/plugin install logstash-input-http_poller -RUN /opt/logstash/bin/plugin install logstash-filter-prune -RUN /opt/logstash/bin/plugin install logstash-output-riemann -ADD run.sh / - -CMD /usr/bin/java -version && sh -e -x /run.sh diff --git a/logstash/jenkins.conf b/logstash/jenkins.conf deleted file mode 100644 index 67190b4..0000000 --- a/logstash/jenkins.conf +++ /dev/null @@ -1,61 +0,0 @@ -input { - file { - path => "/var/log/jenkins/jenkins.log" - start_position => "beginning" - } -} - -filter { - mutate { - add_field => ["@message_type", "jenkins"] - add_field => ["@message", "%{message}"] - } - - multiline { - pattern => "^%{MONTH} %{MONTHDAY}, %{YEAR} %{TIME} (AM|PM)" - negate => true - what => "previous" - } - - mutate { - join => ["@message", "\n"] - } - - grok { - match => [ "@message", "^(?<__date>%{MONTH} %{MONTHDAY}, %{YEAR} %{TIME} (AM|PM)) (?<__msg>.+)" ] - } - date { - match => [ "__date", - "MMM dd, YYYY HH:mm:ss a" - ] - timezone => "CET" - } - grok { - match => ["__msg", "(?[A-Za-z0-9._]+) (?[A-Za-z0-9._]+)\\n(?[^:]+): (?.*)"] - } - - # Lastly, clean-up temporary fields and unwanted tags. - mutate { - remove_field => [ - "message", - "@message", - "__msg", - "__date", - "path" - ] - remove_tag => [ - "multiline", - "_grokparsefailure" - ] - lowercase => [ - "severity" - ] - } -} -output { - elasticsearch_http { - host => "@ES_HOSTNAME@" - port => "@ES_PORT@" - index => "jenkins-logs-%{severity}-%{+YYYY.MM.dd}" - } -} diff --git a/logstash/logstash.repo b/logstash/logstash.repo deleted file mode 100644 index e4e5d82..0000000 --- a/logstash/logstash.repo +++ /dev/null @@ -1,6 +0,0 @@ -[logstash-1.5] -name=logstash repository for 1.5.x packages -baseurl=http://packages.elasticsearch.org/logstash/1.5/centos -gpgcheck=1 -gpgkey=http://packages.elasticsearch.org/GPG-KEY-elasticsearch -enabled=1 diff --git a/logstash/mesos-patterns.conf b/logstash/mesos-patterns.conf deleted file mode 100644 index f227b63..0000000 --- a/logstash/mesos-patterns.conf +++ /dev/null @@ -1,3 +0,0 @@ -LOGLEVEL [I,E,W,F] -MESOSTIMESTAMP %{MONTHNUM}%{MONTHDAY} %{HOUR}:%{MINUTE}:%{SECOND} -MESOSLOG %{LOGLEVEL:loglevel}%{MESOSTIMESTAMP:timestamp}[ ]+%{POSINT:threadid} %{GREEDYDATA:file}:%{POSINT:line}] %{GREEDYDATA:msg} diff --git a/logstash/mesos.conf b/logstash/mesos.conf deleted file mode 100644 index c2c3389..0000000 --- a/logstash/mesos.conf +++ /dev/null @@ -1,54 +0,0 @@ -input { - file { - path => "/var/log/mesos/mesos-master.INFO" - start_position => "beginning" - } - file { - path => "/var/log/mesos/mesos-master.WARNING" - start_position => "beginning" - } - file { - path => "/var/log/mesos/mesos-master.ERROR" - start_position => "beginning" - } -} - -filter { - - grok { - - match => { "message" => "%{MESOSLOG}" } - - } - - mutate { - - gsub => [ - - # make the logTimestamp sortable. otherwise, date filter will break. - - "timestamp", " ", ";" - - ] - - } - - date { - - match => ["timestamp", "MMdd;HH:mm:ss.SSSSSS"] - - } - - mutate { - remove_field => ["timestamp"] - lowercase => ["loglevel"] - } -} - -output { - elasticsearch_http { - host => "@ES_HOSTNAME@" - port => "@ES_PORT@" - index => "mesos-logs-%{loglevel}-%{+YYYY.MM.dd}" - } -} diff --git a/logstash/processes.conf b/logstash/processes.conf deleted file mode 100644 index 9f40585..0000000 --- a/logstash/processes.conf +++ /dev/null @@ -1,22 +0,0 @@ -input { - exec { - command => "find /host/proc/*/ -maxdepth 1 -type f -name stat -exec cat {} \;" - interval => 100 - codec => line {} - } -} - -filter { - mutate { - split => ["message", " "] - add_field => ["comm", "%{message[1]}"] - add_field => ["vsize", "%{message[22]}"] - add_field => ["rss", "%{message[23]}"] - add_field => ["utime", "%{message[13]}"] - add_field => ["stime", "%{message[14]}"] - add_field => ["cutime", "%{message[15]}"] - add_field => ["cstime", "%{message[16]}"] - add_field => ["num_threads", "%{message[19]}"] - remove_field => ["message", "command"] - } -} diff --git a/logstash/run.sh b/logstash/run.sh deleted file mode 100755 index cbfb2b6..0000000 --- a/logstash/run.sh +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/sh -ex - -REPO=${LOGSTASH_REPO-alisw/ali-bot} -CONFIG_DIR=${LOGSTASH_CONFIG_DIR-logstash} - -if [ ! -d /config-ro ]; then - git clone https://github.com/$REPO config-ro -fi - -# Specifing the varius *_HOST variables will enable their related configuration. -mkdir -p /config -[ ! X$ELASTICSEARCH_HOST = X ] && cp /config-ro/${CONFIG_DIR}/*-elasticsearch*.conf /config -[ ! X$MESOS_HOST = X ] && cp /config-ro/${CONFIG_DIR}/*-mesos*.conf /config -[ ! X$MARATHON_HOST = X ] && cp /config-ro/${CONFIG_DIR}/*-marathon*.conf /config -[ ! X$MONALISA_HOST = X ] && cp /config-ro/${CONFIG_DIR}/*-monalisa*.conf /config -[ ! X$RIEMANN_HOST = X ] && cp /config-ro/${CONFIG_DIR}/*-riemann*.conf /config -[ ! X$REDIS_HOST = X ] && cp /config-ro/${CONFIG_DIR}/*-redis*.conf /config -cp /config-ro/${CONFIG_DIR}/*-all*.conf /config - -# Substitute variables in configuration files. -perl -p -i -e "s/ELASTICSEARCH_HOST/$ELASTICSEARCH_HOST/g" /config/*.conf -perl -p -i -e "s/MARATHON_HOST/$MARATHON_HOST/g" /config/*.conf -perl -p -i -e "s/MESOS_HOST/$MESOS_HOST/g" /config/*.conf -perl -p -i -e "s/MONALISA_HOST/$MONALISA_HOST/g" /config/*.conf -perl -p -i -e "s/MONALISA_PORT/$MONALISA_PORT/g" /config/*.conf -perl -p -i -e "s/RIEMANN_HOST/$RIEMANN_HOST/g" /config/*.conf -perl -p -i -e "s/REDIS_HOST/$REDIS_HOST/g" /config/*.conf - -if [ ! "X$DEBUG" = X ]; then - cat << EOF > /config/99-output-debug.conf -output {stdout { codec => rubydebug }} -EOF -fi - -/opt/logstash/bin/logstash -f /config diff --git a/redis/Dockerfile b/redis/Dockerfile deleted file mode 100644 index b07ee04..0000000 --- a/redis/Dockerfile +++ /dev/null @@ -1 +0,0 @@ -FROM redis:3 diff --git a/zookeeper/Dockerfile b/zookeeper/Dockerfile deleted file mode 100644 index 4d2c29a..0000000 --- a/zookeeper/Dockerfile +++ /dev/null @@ -1,15 +0,0 @@ -FROM alisw/slc6-vanilla - -ADD http://archive.cloudera.com/cdh4/one-click-install/redhat/6/x86_64/cloudera-cdh-4-0.x86_64.rpm /tmp/cdh.rpm -ADD http://archive.cloudera.com/cdh4/redhat/6/x86_64/cdh/RPM-GPG-KEY-cloudera /tmp/cdh.key - -RUN yum localinstall -y -q /tmp/cdh.rpm -RUN yum install -y python-setuptools \ - zookeeper-server \ - java-1.8.0-openjdk-headless \ - which - -ADD run.sh /run.sh -EXPOSE 2181 - -CMD /bin/sh -e -x /run.sh diff --git a/zookeeper/run.sh b/zookeeper/run.sh deleted file mode 100644 index 615c746..0000000 --- a/zookeeper/run.sh +++ /dev/null @@ -1,44 +0,0 @@ -#!/usr/bin/sh - -cat << EOF > /etc/zookeeper/conf/zoo.cfg -# The number of milliseconds of each tick -tickTime=2000 -# The number of ticks that the initial -# synchronization phase can take -initLimit=10 -# The number of ticks that can pass between -# sending a request and getting an acknowledgement -syncLimit=5 -# the directory where the snapshot is stored. -dataDir=${ZK_DATADIR-/var/lib/zookeeper/data} -# the port at which the clients will connect -clientPort=${ZK_CLIENT_PORT-2181} -EOF - -#ZK_NODES is the list of nodes which will have zookeeper running on it. -if [ "X$ZK_NODES" = X ]; then - # Single node setup. - if [ ! -x /var/lib/zookeeper/data/myid ]; then - zookeeper-server-initialize --myid=1 - fi -else - # Handle the case for more than 1 node. - # Generate the configuration starting from specified environment variables. - # For the moment we assume that servers all have the same kind of hostname - # in the for XYZ - for x in `echo ${ZK_NODES} | tr , \\ `; do - ZK_NODE_ID=`echo $x | sed -e's/^[a-zA-Z0-]*//;s/[.].*//'` - echo "server.$ZK_NODE_ID=$x:${ZK_PEERS_PORT-2888}:${ZK_ELECTION_PORT-3888}" >> /etc/zookeeper/conf/zoo.cfg - done - echo >> /etc/zookeeper/conf/zoo.cfg - if [ ! -e /var/lib/zookeeper/data/myid ]; then - zookeeper-server-initialize --myid=`hostname | sed -e 's/^[a-zA-Z0-]*//;s/[.].*//'` - fi -fi - -env -cat /etc/hosts -cat /etc/zookeeper/conf/zoo.cfg -cat /var/lib/zookeeper/data/myid -which java -/usr/lib/zookeeper/bin/zkServer.sh start-foreground