openstack/monasca-thresh
Code Issues Proposed changes

Change to use monasca everywhere

Browse Source 
service is now monasca_thresh. Config file in /etc/monasca

Fixed start and stop in install script

Change-Id: I5272c8ac32e497be978f8c59c4c5b6964ed4e9d2
This commit is contained in:
Craig Bryant 2014-08-06 17:13:54 -06:00
parent f72caef55f
commit d96fb0d852
10 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pom.xml
View File

@ -2,8 +2,8 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>monasca-common</groupId> <groupId>monasca</groupId>
<artifactId>monasca-common</artifactId> <artifactId>monasca-thresh-base</artifactId>
<version>${computedVersion}</version> <version>${computedVersion}</version>
<url>http://github.com/stackforge/monasca-common</url> <url>http://github.com/stackforge/monasca-common</url>
<packaging>pom</packaging> <packaging>pom</packaging>

12
thresh/pom.xml
View File

@ -278,24 +278,24 @@
<type>file</type> <type>file</type>
<src>${project.build.directory}/${shadedJarName}.jar <src>${project.build.directory}/${shadedJarName}.jar
</src> </src>
<dst>/opt/mon/mon-thresh.jar</dst> <dst>/opt/monasca/monasca-thresh.jar</dst>
</data> </data>
<data> <data>
<type>file</type> <type>file</type>
<src>${project.basedir}/src/deb/init/mon-thresh</src> <src>${project.basedir}/src/deb/init/monasca-thresh</src>
<dst>/etc/init.d/mon-thresh</dst> <dst>/etc/init.d/monasca-thresh</dst>
</data> </data>
<data> <data>
<type>file</type> <type>file</type>
<src>${project.basedir}/src/main/resources/logback.xml</src> <src>${project.basedir}/src/main/resources/logback.xml</src>
<dst>/etc/mon/logback.xml</dst> <dst>/etc/monasca/logback.xml</dst>
</data> </data>
<data> <data>
<type>file</type> <type>file</type>
<src> <src>
${project.basedir}/src/deb/etc/mon-thresh-config.yml-sample ${project.basedir}/src/deb/etc/thresh-config.yml-sample
</src> </src>
<dst>/etc/mon/thresh-config.yml-sample</dst> <dst>/etc/monasca/thresh-config.yml-sample</dst>
</data> </data>
</dataSet> </dataSet>
</configuration> </configuration>

2
thresh/src/deb/control/control
View File

@ -4,6 +4,6 @@ Priority: optional
Architecture: all Architecture: all
Depends: openjdk-7-jre-headless | openjdk-7-jre Depends: openjdk-7-jre-headless | openjdk-7-jre
Version: [[version]]-[[timestamp]]-[[buildNumber]] Version: [[version]]-[[timestamp]]-[[buildNumber]]
Maintainer: HPCloud Monitoring <hpcs-mon@hp.com> Maintainer: Monasca Team - monasca@lists.launchpad.net
Description: Monasca-Thresh Description: Monasca-Thresh
Reads metrics and generates alarms based on alarm definitions. Reads metrics and generates alarms based on alarm definitions.

6
thresh/src/deb/control/postinst
View File

@ -2,14 +2,14 @@
case "$1" in case "$1" in
configure) configure)
chmod +x /etc/init.d/mon-thresh chmod +x /etc/init.d/monasca-thresh
if ! [ `getent passwd thresh` ]; then if ! [ `getent passwd thresh` ]; then
adduser --system --group thresh adduser --system --group thresh
fi fi
#Restart does not pick up upstart job config changes stop/start is needed #Restart does not pick up upstart job config changes stop/start is needed
stop mon-thresh service monasca-thresh stop
start mon-thresh service monasca-thresh start
;; ;;
esac esac

2
thresh/src/deb/control/prerm
View File

@ -2,7 +2,7 @@
case "$1" in case "$1" in
remove) remove)
stop mon-thresh service monasca-thresh stop
;; ;;
esac esac

0
thresh/src/deb/etc/mon-thresh-config.yml-sample → thresh/src/deb/etc/thresh-config.yml-sample
View File

6
thresh/src/deb/init/mon-thresh → thresh/src/deb/init/monasca-thresh
View File

@ -1,6 +1,6 @@
#! /bin/sh #! /bin/sh
#### BEGIN INIT INFO #### BEGIN INIT INFO
## Provides: mon-thresh ## Provides: monasca-thresh
## Required-Start: $nimbus ## Required-Start: $nimbus
## Required-Stop: ## Required-Stop:
## Default-Start: 2 3 4 5 ## Default-Start: 2 3 4 5
@ -13,9 +13,9 @@ case "$1" in
start) start)
$0 status $0 status
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
sudo -Hu thresh /opt/storm/current/bin/storm jar /opt/mon/mon-thresh.jar monasca.thresh.ThresholdingEngine /etc/mon/mon-thresh-config.yml thresh-cluster sudo -Hu thresh /opt/storm/current/bin/storm jar /opt/monasca/monasca-thresh.jar monasca.thresh.ThresholdingEngine /etc/monasca/thresh-config.yml thresh-cluster
else else
echo "Mon-thresh is already running" echo "monasca-thresh is already running"
fi fi
exit 0 exit 0
;; ;;

0
thresh/src/main/config/mon-thresh-sample-config.yml → thresh/src/main/config/thresh-sample-config.yml
View File

2
thresh/src/main/resources/logback.xml
View File

@ -9,7 +9,7 @@
</appender> </appender>
<appender name="FILE" class="ch.qos.logback.core.FileAppender"> <appender name="FILE" class="ch.qos.logback.core.FileAppender">
<file>${LOGDIR:-/tmp}/mon-thresh.log</file> <file>${LOGDIR:-/tmp}/monasca-thresh.log</file>
<encoder> <encoder>
<pattern>%date %level [%thread] %logger{10} [%file:%line] %msg%n</pattern> <pattern>%date %level [%thread] %logger{10} [%file:%line] %msg%n</pattern>

2
thresh/src/test/resources/logback.xml
View File

@ -9,7 +9,7 @@
</appender> </appender>
<appender name="FILE" class="ch.qos.logback.core.FileAppender"> <appender name="FILE" class="ch.qos.logback.core.FileAppender">
<file>${LOGDIR:-/tmp}/mon-thresh.log</file> <file>${LOGDIR:-/tmp}/monasca-thresh.log</file>
<encoder> <encoder>
<pattern>%date %level [%thread] %logger{10} [%file:%line] %msg%n</pattern> <pattern>%date %level [%thread] %logger{10} [%file:%line] %msg%n</pattern>