Only the jar and sample config in the deb

Remove control scripts from deb

Update sample config file to be more current

Change-Id: If97d25c0b8e01eb002aadf642dfc5c7912b92c99

java/pom.xml

@@ -252,11 +252,6 @@
                                     </src>
                                     <dst>/opt/monasca/monasca-persister.jar</dst>
                                 </data>
-                                <data>
-                                    <type>file</type>
-                                    <src>${project.basedir}/src/deb/init/monasca-persister.conf</src>
-                                    <dst>/etc/init/monasca-persister.conf</dst>
-                                </data>
                                 <data>
                                     <type>file</type>
                                     <src>

java/src/assembly/tar.xml

@@ -25,9 +25,5 @@
         <source>${project.basedir}/src/deb/etc/persister-config.yml-sample</source>
         <outputDirectory>examples</outputDirectory>
     </file>
-    <file>
-        <source>${project.basedir}/src/deb/init/monasca-persister.conf</source>
-        <outputDirectory>examples</outputDirectory>
-    </file>
   </files>
 </assembly>

java/src/deb/control/control

@@ -5,5 +5,5 @@ Architecture: all
 Depends: openjdk-7-jre-headless | openjdk-7-jre
 Version: [[version]]-[[timestamp]]-[[buildNumber]]
 Maintainer: HPCloud Monitoring <hpcs-mon@hp.com>
-Description: Mon-Persister
+Description: Monasca-Persister
-  Pulls data from various sources and inserts into the SOM DB.
+  Reads data from Kafka and inserts into the Monasca DB.

java/src/deb/control/postinst

@@ -1,15 +0,0 @@
-#!/bin/sh
-
-case "$1" in
-  configure)
-    if ! [ `getent passwd persister` ]; then
-      adduser --system --group persister
-    fi
-
-    #Restart does not pick up upstart job config changes stop/start is needed
-    stop monasca-persister
-    start monasca-persister
-  ;;
-esac
-
-exit 0

java/src/deb/control/postrm

@@ -1,9 +0,0 @@
-#!/bin/sh
-
-case "$1" in
-  remove|purge)
-    userdel persister
-  ;;
-esac
-
-exit 0

java/src/deb/control/prerm

@@ -1,9 +0,0 @@
-#!/bin/sh
-
-case "$1" in
-  remove)
-    stop monasca-persister
-  ;;
-esac
-
-exit 0

java/src/deb/etc/persister-config.yml-sample

@@ -1,18 +1,32 @@
 name: monasca-persister
 
-#Kafka settings.
+alarmHistoryConfiguration:
-kafkaConfiguration:
+  batchSize: 100
-# See http://kafka.apache.org/documentation.html#api for semantics and defaults.
-  topic: test
   numThreads: 2
-  groupId: 1
+  maxBatchTime: 15
+# See http://kafka.apache.org/documentation.html#api for semantics and defaults.
+  topic: alarm-state-transitions
+  groupId: 1_alarm-state-transitions
+  consumerId: mini-mon
+  clientId : 1
+
+metricConfiguration:
+  batchSize: 10000
+  numThreads: 4
+  maxBatchTime: 15
+# See http://kafka.apache.org/documentation.html#api for semantics and defaults.
+  topic: metrics
+  groupId: 1_metrics
+  consumerId: mini-mon
+  clientId : 1
+
+#Kafka settings.
+kafkaConfig:
+# See http://kafka.apache.org/documentation.html#api for semantics and defaults.
   zookeeperConnect: localhost:2181
-  consumerId: 1
   socketTimeoutMs: 30000
   socketReceiveBufferBytes : 65536
   fetchMessageMaxBytes: 1048576
-  autoCommitEnable: true
-  autoCommitIntervalMs: 60000
   queuedMaxMessageChunks: 10
   rebalanceMaxRetries: 4
   fetchMinBytes:  1
@@ -20,141 +34,84 @@ kafkaConfiguration:
   rebalanceBackoffMs: 2000
   refreshLeaderBackoffMs: 200
   autoOffsetReset: largest
-  consumerTimeoutMs:  -1
+  consumerTimeoutMs:  1000
-  clientId : 1
+  zookeeperSessionTimeoutMs : 60000
-  zookeeperSessionTimeoutMs : 6000
+  zookeeperConnectionTimeoutMs : 60000
-  zookeeperConnectionTimeoutMs : 6000
   zookeeperSyncTimeMs: 2000
 
-disruptorConfiguration:
+verticaMetricRepoConfig:
-  bufferSize:  1048576
-  numProcessors: 2
-
-verticaOutputProcessorConfiguration:
-  batchSize: 2
-
-monDeDuperConfiguration:
-  dedupeRunFrequencySeconds: 30
-
-verticaMetricRepositoryConfiguration:
   maxCacheSize: 2000000
 
-
 databaseConfiguration:
-  driverClass: com.vertica.jdbc.Driver
+# vertica | influxdb
-#  url: jdbc:vertica://mini-mon:5433/monasca
+  databaseType: influxdb
-  url: jdbc:vertica://15.185.94.245:5433/som
+
-  user: persister
+# Uncomment if databaseType is influxdb
+influxDbConfiguration:
+  # Retention policy may be left blank to indicate default policy.
+  retentionPolicy:
+  maxHttpConnections: 100
+  name: mon
+  url: http://localhost:8086
+  user: mon_persister
   password: password
-  properties:
-      ssl: false
-  # the maximum amount of time to wait on an empty pool before throwing an exception
-  maxWaitForConnection: 1s
 
-  # the SQL query to run when validating a connection's liveness
+# Uncomment if databaseType is vertica
-  validationQuery: "/* MyService Health Check */ SELECT 1"
+#dataSourceFactory:
+#  driverClass: com.vertica.jdbc.Driver
+#  url: jdbc:vertica://locahost:5433/mon
+#  user: dbadmin
+#  password: password
+#  properties:
+#      ssl: false
+#  # the maximum amount of time to wait on an empty pool before throwing an exception
+#  maxWaitForConnection: 1s
+#  # the SQL query to run when validating a connection's liveness
+#  validationQuery: "/* MyService Health Check */ SELECT 1"
+#  # the minimum number of connections to keep open
+#  minSize: 8
+#  # the maximum number of connections to keep open
+#  maxSize: 41
+#  # whether or not idle connections should be validated
+#  checkConnectionWhileIdle: false
+#  # the maximum lifetime of an idle connection
+#  maxConnectionAge: 1 minute
 
-  # the minimum number of connections to keep open
+metrics:
-  minSize: 8
+  frequency: 1 second
 
-  # the maximum number of connections to keep open
-
-
-  maxSize: 41
-
-  # whether or not idle connections should be validated
-  checkConnectionWhileIdle: false
-
-  # how long a connection must be held before it can be validated
-  checkConnectionHealthWhenIdleFor: 10s
-
-  # the maximum lifetime of an idle connection
-  closeConnectionIfIdleFor: 1 minute
 
 # Logging settings.
 logging:
 
   # The default level of all loggers. Can be OFF, ERROR, WARN, INFO,
   # DEBUG, TRACE, or ALL.
-  level: DEBUG
+  level: INFO
 
   # Logger-specific levels.
   loggers:
 
     # Sets the level for 'com.example.app' to DEBUG.
-    com.example.app: DEBUG
+      com.example.app: DEBUG
+    # com.hpcloud: debug
+    # com.hpcloud.mon.persister.repository: DEBUG
 
-  # Settings for logging to stdout.
+  appenders:
-  console:
 
-    # If true, write log statements to stdout.
+    - type: file
-    enabled: true
+      threshold: INFO
+      archive: true
+      currentLogFilename: /var/log/monasca/persister/monasca-persister.log
+      archivedLogFilenamePattern: /var/log/monasca/persister/monasca-persister.log-%d.log.gz
+      archivedFileCount: 5
+      # The timezone used to format dates. HINT: USE THE DEFAULT, UTC.
+      timeZone: UTC
 
-    # Do not display log statements below this threshold to stdout.
+# Set the persister ports to 8090/8091 to avoid conflict with the api
-    threshold: ALL
+server:
-
+  applicationConnectors:
-    # The time zone in which dates should be displayed.
+    - type: http
-    timeZone: UTC
+      port: 8090
-
+  adminConnectors:
-    # A custom Logback format string.
+    - type: http
-    logFormat: null
+      port: 8091
-
-  # Settings for logging to a file.
-  file:
-
-    # If true, write log statements to a file.
-    enabled: true
-
-    # Do not write log statements below this threshold to the file.
-    threshold: ALL
-
-    # The time zone in which dates should be displayed.
-    timeZone: UTC
-
-    # A custom Logback format string.
-    logFormat: null
-
-    # The file to which statements will be logged.
-    #
-    # If enabled is true, this must be specified.
-    currentLogFilename: ./logs/monasca-persister.log
-
-    # If true, log files are rotated and archived.
-    archive: true
-
-    # When the log file rolls over, the file will be archived to
-    # app-2012-03-15.log.gz, example.log will be truncated,
-    # and new statements written to it.
-    #
-    # If archive is true, this must be specified.
-    archivedLogFilenamePattern: ./logs/monasca-persister-%d.log.gz
-
-    # The maximum number of log files to archive.
-    archivedFileCount: 5
-
-  # Settings for logging to syslog.
-  syslog:
-
-    # If true, write log statements to syslog.
-    enabled: false
-
-    # The hostname of the syslog server to which statements will be
-    # sent.
-    #
-    # N.B.: If this is the local host, the local syslog instance
-    # will need to be configured to listen on an inet socket, not just
-    # a Unix socket.
-    host: localhost
-
-    # The syslog facility to which statements will be sent.
-    #
-    # Can be one of: {AUTH, AUTHPRIV, DAEMON, CRON, FTP, LPR, KERN,
-    # MAIL, NEWS, SYSLOG, USER, UUCP, LOCAL0, LOCAL1, LOCAL2, LOCAL3,
-    # LOCAL4, LOCAL5, LOCAL6, LOCAL7}.
-    facility: local0
-
-    # The time zone in which dates should be displayed.
-    timeZone: UTC
-
-    # A custom Logback format string.
-    logFormat: null

java/src/deb/init/monasca-persister.conf

@@ -1,11 +0,0 @@
-# Startup script for the monasca-persister
-
-description "Monasca Persister java app"
-start on runlevel [2345]
-
-console log
-respawn
-
-setgid monasca
-setuid persister
-exec /usr/bin/java -Dfile.encoding=UTF-8 -Xmx8g -cp /opt/monasca/monasca-persister.jar:/opt/monasca/vertica/vertica_jdbc.jar monasca.persister.PersisterApplication server /etc/monasca/persister-config.yml