Remove all dependencies on hpcloud maven repository
Changes to match the newest version of the influxdb java API. This is the one on the public maven repository. This may require deletion of the influxdb in the local maven repository if it is the version from hpcloud nexus as they both have the same version number Changed mon-api start to pick up vertica jdbc jar from /opt/mon/vertica since vertica jdbc jar can't be redistributed Removed vertica jdbc jar and hpcloud nexus from pom.xml Change-Id: I4b46ac9a5138a37c18d5c0482ea9c4fc24e89ca3
This commit is contained in:
parent
90ea8e2e55
commit
ab6dbbfedc
21
pom.xml
21
pom.xml
|
@ -29,22 +29,6 @@
|
|||
<developerConnection>scm:git:git@github.com:stackforge/monasca-api</developerConnection>
|
||||
</scm>
|
||||
|
||||
<repositories>
|
||||
<repository>
|
||||
<id>nexus releases</id>
|
||||
<url>http://nexus.paas.hpcloud.net:8081/nexus/content/repositories/releases</url>
|
||||
</repository>
|
||||
<repository>
|
||||
<id>nexus 3rd party</id>
|
||||
<url>http://nexus.paas.hpcloud.net:8081/nexus/content/repositories/thirdparty</url>
|
||||
</repository>
|
||||
<repository>
|
||||
<id>nexus-snapshots</id>
|
||||
<name>nexus snapshots</name>
|
||||
<url>http://nexus.paas.hpcloud.net:8081/nexus/content/repositories/snapshots</url>
|
||||
</repository>
|
||||
</repositories>
|
||||
|
||||
<profiles>
|
||||
<profile>
|
||||
<id>release-deploy-url-override</id>
|
||||
|
@ -115,11 +99,6 @@
|
|||
<artifactId>dropwizard-jersey</artifactId>
|
||||
<version>${dropwizard.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.vertica</groupId>
|
||||
<artifactId>vertica-jdbc</artifactId>
|
||||
<version>6.1.0</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>mysql</groupId>
|
||||
<artifactId>mysql-connector-java</artifactId>
|
||||
|
|
|
@ -8,4 +8,4 @@ respawn
|
|||
|
||||
setgid mon_api
|
||||
setuid mon_api
|
||||
exec /usr/bin/java -Xmx8g -cp /opt/mon/mon-api.jar com.hpcloud.mon.MonApiApplication server /etc/mon/mon-api-config.yml
|
||||
exec /usr/bin/java -Xmx8g -cp /opt/mon/mon-api.jar:/opt/mon/vertica/vertica_jdbc.jar com.hpcloud.mon.MonApiApplication server /etc/mon/mon-api-config.yml
|
||||
|
|
|
@ -143,19 +143,20 @@ public class AlarmStateHistoryInfluxDbRepositoryImpl implements AlarmStateHistor
|
|||
|
||||
// Should only be one serie -- alarm_state_history.
|
||||
for (Serie serie : result) {
|
||||
Object[][] valObjArryArry = serie.getPoints();
|
||||
for (int i = 0; i < valObjArryArry.length; i++) {
|
||||
final String[] colNames = serie.getColumns();
|
||||
final List<Map<String, Object>> rows = serie.getRows();
|
||||
for (Map<String, Object> row : rows) {
|
||||
|
||||
AlarmStateHistory alarmStateHistory = new AlarmStateHistory();
|
||||
// Time is always in position 0.
|
||||
Double timeDouble = (Double) valObjArryArry[i][0];
|
||||
Double timeDouble = (Double) row.get(colNames[0]);
|
||||
alarmStateHistory.setTimestamp(new DateTime(timeDouble.longValue(), DateTimeZone.UTC));
|
||||
// Sequence_number is always in position 1.
|
||||
alarmStateHistory.setAlarmId((String) valObjArryArry[i][2]);
|
||||
alarmStateHistory.setNewState(AlarmState.valueOf((String) valObjArryArry[i][3]));
|
||||
alarmStateHistory.setOldState(AlarmState.valueOf((String) valObjArryArry[i][4]));
|
||||
alarmStateHistory.setReason((String) valObjArryArry[i][5]);
|
||||
alarmStateHistory.setReasonData((String) valObjArryArry[i][6]);
|
||||
alarmStateHistory.setAlarmId((String) row.get(colNames[2]));
|
||||
alarmStateHistory.setNewState(AlarmState.valueOf((String) row.get(colNames[3])));
|
||||
alarmStateHistory.setOldState(AlarmState.valueOf((String) row.get(colNames[4])));
|
||||
alarmStateHistory.setReason((String) row.get(colNames[5]));
|
||||
alarmStateHistory.setReasonData((String) row.get(colNames[6]));
|
||||
|
||||
alarmStateHistoryList.add(alarmStateHistory);
|
||||
}
|
||||
|
|
|
@ -76,18 +76,19 @@ public class MeasurementInfluxDbRepositoryImpl implements MeasurementRepository
|
|||
measurements.setDimensions(dimensions == null ? new HashMap<String, String>() : dimensions);
|
||||
List<Object[]> valObjArryList = new LinkedList<>();
|
||||
for (Serie serie : result) {
|
||||
Object[][] valObjArry = serie.getPoints();
|
||||
for (int i = 0; i < valObjArry.length; i++) {
|
||||
final String[] colNames = serie.getColumns();
|
||||
final List<Map<String, Object>> rows = serie.getRows();
|
||||
for (Map<String, Object> row : rows) {
|
||||
|
||||
Object[] objArry = new Object[3];
|
||||
|
||||
// sequence_number
|
||||
objArry[0] = ((Double) valObjArry[i][1]).longValue();
|
||||
objArry[0] = ((Double) row.get(colNames[1])).longValue();
|
||||
// time
|
||||
Double timeDouble = (Double) valObjArry[i][0];
|
||||
Double timeDouble = (Double) row.get(colNames[0]);
|
||||
objArry[1] = DATETIME_FORMATTER.print(timeDouble.longValue());
|
||||
// value
|
||||
objArry[2] = (Double) valObjArry[i][2];
|
||||
objArry[2] = (Double) row.get(colNames[2]);
|
||||
|
||||
valObjArryList.add(objArry);
|
||||
}
|
||||
|
|
|
@ -115,17 +115,20 @@ public class MetricDefinitionInfluxDbRepositoryImpl implements MetricDefinitionR
|
|||
for (Serie serie : result2) {
|
||||
|
||||
// Each set of points is a unique measurement definition.
|
||||
for (Object[] pointsArry : serie.getPoints()) {
|
||||
final String[] colNames = serie.getColumns();
|
||||
final List<Map<String, Object>> rows = serie.getRows();
|
||||
|
||||
for (Map<String, Object> row : rows) {
|
||||
|
||||
MetricDefinition metricDefinition = new MetricDefinition();
|
||||
metricDefinition.name = serie.getName();
|
||||
|
||||
Map<String, String> dimMap = new HashMap<String, String>();
|
||||
// time and max(value) are always the first columns. Skip them.
|
||||
for (int i = 2; i < serie.getColumns().length; ++i) {
|
||||
Object dimValue = pointsArry[i];
|
||||
for (int i = 2; i < colNames.length; ++i) {
|
||||
Object dimValue = row.get(colNames[i]);
|
||||
if (dimValue != null) {
|
||||
dimMap.put((String) serie.getColumns()[i], (String) dimValue);
|
||||
dimMap.put((String) colNames[i], (String) dimValue);
|
||||
}
|
||||
}
|
||||
metricDefinition.setDimensions(dimMap);
|
||||
|
|
|
@ -82,14 +82,15 @@ public class StatisticInfluxDbRepositoryImpl implements StatisticRepository {
|
|||
stat.setDimensions(dimensions == null ? new HashMap<String, String>() : dimensions);
|
||||
List<List<Object>> valObjArryArry = new LinkedList<List<Object>>();
|
||||
stat.setStatistics(valObjArryArry);
|
||||
Object[][] pointsArryArry = serie.getPoints();
|
||||
for (int i = 0; i < pointsArryArry.length; i++) {
|
||||
final String[] colNames = serie.getColumns();
|
||||
final List<Map<String, Object>> rows = serie.getRows();
|
||||
for (Map<String, Object> row : rows) {
|
||||
List<Object> valObjArry = new ArrayList<>();
|
||||
// First column is always time.
|
||||
Double timeDouble = (Double) pointsArryArry[i][0];
|
||||
Double timeDouble = (Double) row.get(colNames[0]);
|
||||
valObjArry.add(DATETIME_FORMATTER.print(timeDouble.longValue()));
|
||||
for (int j = 1; j < statistics.size() + 1; j++) {
|
||||
valObjArry.add(pointsArryArry[i][j]);
|
||||
valObjArry.add(row.get(colNames[j]));
|
||||
}
|
||||
valObjArryArry.add(valObjArry);
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue