From ab6dbbfedc0cb3e60bfbe43751c31c45e8ce1ac7 Mon Sep 17 00:00:00 2001 From: Craig Bryant Date: Sat, 16 Aug 2014 20:55:37 -0600 Subject: [PATCH] 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 --- pom.xml | 21 ------------------- src/deb/init/mon-api.conf | 2 +- ...armStateHistoryInfluxDbRepositoryImpl.java | 17 ++++++++------- .../MeasurementInfluxDbRepositoryImpl.java | 11 +++++----- ...etricDefinitionInfluxDbRepositoryImpl.java | 11 ++++++---- .../StatisticInfluxDbRepositoryImpl.java | 9 ++++---- 6 files changed, 28 insertions(+), 43 deletions(-) diff --git a/pom.xml b/pom.xml index c954507ff..3a44aabfd 100644 --- a/pom.xml +++ b/pom.xml @@ -29,22 +29,6 @@ scm:git:git@github.com:stackforge/monasca-api - - - nexus releases - http://nexus.paas.hpcloud.net:8081/nexus/content/repositories/releases - - - nexus 3rd party - http://nexus.paas.hpcloud.net:8081/nexus/content/repositories/thirdparty - - - nexus-snapshots - nexus snapshots - http://nexus.paas.hpcloud.net:8081/nexus/content/repositories/snapshots - - - release-deploy-url-override @@ -115,11 +99,6 @@ dropwizard-jersey ${dropwizard.version} - - com.vertica - vertica-jdbc - 6.1.0 - mysql mysql-connector-java diff --git a/src/deb/init/mon-api.conf b/src/deb/init/mon-api.conf index 7566dbd33..58264cb8e 100644 --- a/src/deb/init/mon-api.conf +++ b/src/deb/init/mon-api.conf @@ -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 diff --git a/src/main/java/com/hpcloud/mon/infrastructure/persistence/influxdb/AlarmStateHistoryInfluxDbRepositoryImpl.java b/src/main/java/com/hpcloud/mon/infrastructure/persistence/influxdb/AlarmStateHistoryInfluxDbRepositoryImpl.java index 0aa6266db..7f395b066 100644 --- a/src/main/java/com/hpcloud/mon/infrastructure/persistence/influxdb/AlarmStateHistoryInfluxDbRepositoryImpl.java +++ b/src/main/java/com/hpcloud/mon/infrastructure/persistence/influxdb/AlarmStateHistoryInfluxDbRepositoryImpl.java @@ -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> rows = serie.getRows(); + for (Map 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); } diff --git a/src/main/java/com/hpcloud/mon/infrastructure/persistence/influxdb/MeasurementInfluxDbRepositoryImpl.java b/src/main/java/com/hpcloud/mon/infrastructure/persistence/influxdb/MeasurementInfluxDbRepositoryImpl.java index ef57cb9ce..77295d0b2 100644 --- a/src/main/java/com/hpcloud/mon/infrastructure/persistence/influxdb/MeasurementInfluxDbRepositoryImpl.java +++ b/src/main/java/com/hpcloud/mon/infrastructure/persistence/influxdb/MeasurementInfluxDbRepositoryImpl.java @@ -76,18 +76,19 @@ public class MeasurementInfluxDbRepositoryImpl implements MeasurementRepository measurements.setDimensions(dimensions == null ? new HashMap() : dimensions); List 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> rows = serie.getRows(); + for (Map 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); } diff --git a/src/main/java/com/hpcloud/mon/infrastructure/persistence/influxdb/MetricDefinitionInfluxDbRepositoryImpl.java b/src/main/java/com/hpcloud/mon/infrastructure/persistence/influxdb/MetricDefinitionInfluxDbRepositoryImpl.java index 2f6f3552f..ae6c10391 100644 --- a/src/main/java/com/hpcloud/mon/infrastructure/persistence/influxdb/MetricDefinitionInfluxDbRepositoryImpl.java +++ b/src/main/java/com/hpcloud/mon/infrastructure/persistence/influxdb/MetricDefinitionInfluxDbRepositoryImpl.java @@ -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> rows = serie.getRows(); + + for (Map row : rows) { MetricDefinition metricDefinition = new MetricDefinition(); metricDefinition.name = serie.getName(); Map dimMap = new HashMap(); // 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); diff --git a/src/main/java/com/hpcloud/mon/infrastructure/persistence/influxdb/StatisticInfluxDbRepositoryImpl.java b/src/main/java/com/hpcloud/mon/infrastructure/persistence/influxdb/StatisticInfluxDbRepositoryImpl.java index ff9c24f16..33fc818a2 100644 --- a/src/main/java/com/hpcloud/mon/infrastructure/persistence/influxdb/StatisticInfluxDbRepositoryImpl.java +++ b/src/main/java/com/hpcloud/mon/infrastructure/persistence/influxdb/StatisticInfluxDbRepositoryImpl.java @@ -82,14 +82,15 @@ public class StatisticInfluxDbRepositoryImpl implements StatisticRepository { stat.setDimensions(dimensions == null ? new HashMap() : dimensions); List> valObjArryArry = new LinkedList>(); stat.setStatistics(valObjArryArry); - Object[][] pointsArryArry = serie.getPoints(); - for (int i = 0; i < pointsArryArry.length; i++) { + final String[] colNames = serie.getColumns(); + final List> rows = serie.getRows(); + for (Map row : rows) { List 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); }