Deb only installs jar and example config now
Removed starts script and config file since those are configured using Ansible Made example config match the current api config file Change-Id: I771f69fc70a852b63dbd47c9b6d338bf7c8b8e5c
This commit is contained in:
parent
ae37ff073e
commit
d903cdb105
|
@ -384,11 +384,6 @@
|
||||||
<src>${project.build.directory}/${shadedJarName}.jar</src>
|
<src>${project.build.directory}/${shadedJarName}.jar</src>
|
||||||
<dst>/opt/monasca/monasca-api.jar</dst>
|
<dst>/opt/monasca/monasca-api.jar</dst>
|
||||||
</data>
|
</data>
|
||||||
<data>
|
|
||||||
<type>file</type>
|
|
||||||
<src>${project.basedir}/src/deb/init/monasca-api.conf</src>
|
|
||||||
<dst>/etc/init/monasca-api.conf</dst>
|
|
||||||
</data>
|
|
||||||
<data>
|
<data>
|
||||||
<type>file</type>
|
<type>file</type>
|
||||||
<src>${project.basedir}/src/deb/etc/api-config.yml-sample
|
<src>${project.basedir}/src/deb/etc/api-config.yml-sample
|
||||||
|
|
|
@ -25,9 +25,5 @@
|
||||||
<source>${project.basedir}/src/deb/etc/api-config.yml-sample</source>
|
<source>${project.basedir}/src/deb/etc/api-config.yml-sample</source>
|
||||||
<outputDirectory>examples</outputDirectory>
|
<outputDirectory>examples</outputDirectory>
|
||||||
</file>
|
</file>
|
||||||
<file>
|
|
||||||
<source>${project.basedir}/src/deb/init/monasca-api.conf</source>
|
|
||||||
<outputDirectory>examples</outputDirectory>
|
|
||||||
</file>
|
|
||||||
</files>
|
</files>
|
||||||
</assembly>
|
</assembly>
|
||||||
|
|
|
@ -1,15 +0,0 @@
|
||||||
#!/bin/sh
|
|
||||||
|
|
||||||
case "$1" in
|
|
||||||
configure)
|
|
||||||
if ! [ `getent passwd monasca_api` ]; then
|
|
||||||
adduser --system --group monasca_api
|
|
||||||
fi
|
|
||||||
|
|
||||||
#Restart does not pick up upstart job config changes stop/start is needed
|
|
||||||
stop monasca-api
|
|
||||||
start monasca-api
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
exit 0
|
|
|
@ -1,9 +0,0 @@
|
||||||
#!/bin/sh
|
|
||||||
|
|
||||||
case "$1" in
|
|
||||||
remove|purge)
|
|
||||||
userdel monasca_api
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
exit 0
|
|
|
@ -1,6 +1,9 @@
|
||||||
# The region for which all metrics passing through this server will be persisted
|
# The region for which all metrics passing through this server will be persisted
|
||||||
region: region-a
|
region: region-a
|
||||||
|
|
||||||
|
# Maximum rows (Mysql) or points (Influxdb) to return when listing elements
|
||||||
|
maxQueryLimit: 10000
|
||||||
|
|
||||||
# Whether this server is running on a secure port
|
# Whether this server is running on a secure port
|
||||||
accessedViaHttps: false
|
accessedViaHttps: false
|
||||||
|
|
||||||
|
@ -11,24 +14,37 @@ metricsTopic: metrics
|
||||||
eventsTopic: events
|
eventsTopic: events
|
||||||
|
|
||||||
kafka:
|
kafka:
|
||||||
brokerUris:
|
brokerUris:
|
||||||
- 192.168.10.10:9092
|
- 192.168.10.4:9092
|
||||||
zookeeperUris:
|
zookeeperUris:
|
||||||
- 192.168.10.10:2181
|
- 192.168.10.4:2181
|
||||||
healthCheckTopic: healthcheck
|
healthCheckTopic: healthcheck
|
||||||
|
|
||||||
mysql:
|
mysql:
|
||||||
driverClass: com.mysql.jdbc.Driver
|
driverClass: com.mysql.jdbc.Driver
|
||||||
url: jdbc:mysql://192.168.10.6:3306/mon?connectTimeout=5000&autoReconnect=true
|
url: jdbc:mysql://192.168.10.4:3306/mon?connectTimeout=5000&autoReconnect=true&useLegacyDatetimeCode=false
|
||||||
user: monapi
|
user: monapi
|
||||||
password: password
|
password: password
|
||||||
maxWaitForConnection: 1s
|
maxWaitForConnection: 1s
|
||||||
validationQuery: "/* MyService Health Check */ SELECT 1"
|
validationQuery: "/* MyService Health Check */ SELECT 1"
|
||||||
minSize: 4
|
minSize: 8
|
||||||
maxSize: 32
|
maxSize: 32
|
||||||
checkConnectionWhileIdle: false
|
checkConnectionWhileIdle: false
|
||||||
checkConnectionOnBorrow: true
|
checkConnectionOnBorrow: true
|
||||||
|
|
||||||
|
databaseConfiguration:
|
||||||
|
databaseType: influxdb
|
||||||
|
|
||||||
|
influxDB:
|
||||||
|
version: V9
|
||||||
|
maxHttpConnections: 100
|
||||||
|
# Retention policy may be left blank to indicate default policy.
|
||||||
|
retentionPolicy:
|
||||||
|
name: mon
|
||||||
|
url: http://192.168.10.4:8086
|
||||||
|
user: mon_api
|
||||||
|
password: password
|
||||||
|
|
||||||
vertica:
|
vertica:
|
||||||
driverClass: com.vertica.jdbc.Driver
|
driverClass: com.vertica.jdbc.Driver
|
||||||
url: jdbc:vertica://192.168.10.8/mon
|
url: jdbc:vertica://192.168.10.8/mon
|
||||||
|
@ -41,31 +57,53 @@ vertica:
|
||||||
checkConnectionWhileIdle: false
|
checkConnectionWhileIdle: false
|
||||||
|
|
||||||
middleware:
|
middleware:
|
||||||
enabled: false
|
enabled: true
|
||||||
serviceIds: 100
|
|
||||||
endpointIds: 160
|
|
||||||
serverVIP: identity.example.com
|
serverVIP: identity.example.com
|
||||||
serverPort: 9543
|
serverPort: 9543
|
||||||
|
useHttps: true
|
||||||
|
truststore: etc/monasca/truststore.jks
|
||||||
|
truststorePass: changeit
|
||||||
connTimeout: 500
|
connTimeout: 500
|
||||||
connSSLClientAuth: true
|
connSSLClientAuth: true
|
||||||
keystore: etc/monasca/keystore.jks
|
keystore: etc/monasca/keystore.jks
|
||||||
keystorePass: changeit
|
keystorePass: changeit
|
||||||
truststore: etc/monasca/truststore.jks
|
|
||||||
truststorePass: changeit
|
|
||||||
connPoolMaxActive: 3
|
connPoolMaxActive: 3
|
||||||
connPoolMaxIdle: 3
|
connPoolMaxIdle: 3
|
||||||
connPoolEvictPeriod: 600000
|
connPoolEvictPeriod: 600000
|
||||||
connPoolMinIdleTime: 600000
|
connPoolMinIdleTime: 600000
|
||||||
connRetryTimes: 2
|
connRetryTimes: 2
|
||||||
connRetryInterval: 50
|
connRetryInterval: 50
|
||||||
rolesToMatch: [user, domainuser, domainadmin]
|
defaultAuthorizedRoles: [user, domainuser, domainadmin, monasca-user]
|
||||||
|
agentAuthorizedRoles: [monasca-agent]
|
||||||
|
adminAuthMethod: password
|
||||||
|
adminUser: admin
|
||||||
|
adminPassword: admin
|
||||||
|
adminProjectId:
|
||||||
|
adminProjectName:
|
||||||
|
adminToken:
|
||||||
|
timeToCacheToken: 600
|
||||||
|
maxTokenCacheSize: 1048576
|
||||||
|
|
||||||
|
server:
|
||||||
|
applicationConnectors:
|
||||||
|
- type: http
|
||||||
|
port: 8080
|
||||||
|
maxRequestHeaderSize: 16KiB # Allow large headers used by keystone tokens
|
||||||
|
requestLog:
|
||||||
|
timeZone: UTC
|
||||||
|
appenders:
|
||||||
|
- type: file
|
||||||
|
currentLogFilename: /var/log/monasca/api/request.log
|
||||||
|
threshold: ALL
|
||||||
|
archive: true
|
||||||
|
archivedLogFilenamePattern: /var/log/monasca/api/request-%d.log.gz
|
||||||
|
archivedFileCount: 5
|
||||||
|
|
||||||
# Logging settings.
|
# Logging settings.
|
||||||
logging:
|
logging:
|
||||||
|
|
||||||
# The default level of all loggers. Can be OFF, ERROR, WARN, INFO, DEBUG, TRACE, or ALL.
|
# The default level of all loggers. Can be OFF, ERROR, WARN, INFO, DEBUG, TRACE, or ALL.
|
||||||
level: INFO
|
level: WARN
|
||||||
|
|
||||||
# Logger-specific levels.
|
# Logger-specific levels.
|
||||||
loggers:
|
loggers:
|
||||||
|
@ -81,10 +119,10 @@ logging:
|
||||||
logFormat: # TODO
|
logFormat: # TODO
|
||||||
|
|
||||||
- type: file
|
- type: file
|
||||||
currentLogFilename: ./log/monasca-api.log
|
currentLogFilename: /var/log/monasca/api/monasca-api.log
|
||||||
threshold: ALL
|
threshold: ALL
|
||||||
archive: true
|
archive: true
|
||||||
archivedLogFilenamePattern: ./log/monasca-api-%d.log
|
archivedLogFilenamePattern: /var/log/monasca/api/monasca-api-%d.log.gz
|
||||||
archivedFileCount: 5
|
archivedFileCount: 5
|
||||||
timeZone: UTC
|
timeZone: UTC
|
||||||
logFormat: # TODO
|
logFormat: # TODO
|
||||||
|
|
|
@ -1,11 +0,0 @@
|
||||||
# Startup script for the Monasca API
|
|
||||||
|
|
||||||
description "Monasca API java app"
|
|
||||||
start on runlevel [2345]
|
|
||||||
|
|
||||||
console log
|
|
||||||
respawn
|
|
||||||
|
|
||||||
setgid monasca
|
|
||||||
setuid monasca_api
|
|
||||||
exec /usr/bin/java -Xmx8g -cp /opt/monasca/monasca-api.jar:/opt/monasca/vertica/vertica_jdbc.jar monasca.api.MonApiApplication server /etc/monasca/api-config.yml
|
|
Loading…
Reference in New Issue