Merge dbe067f into a6a3432

telefonicaid · Jan 12, 2015 · 28a8272 · 28a8272
2 parents a6a3432 + dbe067f
commit 28a8272
Show file tree

Hide file tree

Showing 13 changed files with 599 additions and 429 deletions.
diff --git a/ngsi_adapter/script/build/files/jenkins/fiware-monitoring-ngsi-adapter-build.xml b/ngsi_adapter/script/build/files/jenkins/fiware-monitoring-ngsi-adapter-build.xml
@@ -0,0 +1,170 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+  <actions/>
+  <description>&lt;a href=&quot;https://github.com/telefonicaid/fiware-monitoring/tree/develop/ngsi_adapter&quot;&gt;&#xd;
+FIWARE Monitoring GE: NGSI Adapter&#xd;
+&lt;/a&gt;&#xd;
+&lt;br&gt;&lt;br&gt;&lt;img src=&quot;/../jenkins/job/fiware-monitoring-ngsi-adapter-build/badge/icon&quot;&gt;&#xd;
+&lt;a href=&quot;/../jenkins/job/metrics-queue-consumer&quot;&gt;Metrics&lt;/a&gt;&#xd;
+&lt;img src=&quot;/../jenkins/job/metrics-queue-consumer/lastBuild/buildStatus&quot; width=&quot;16&quot;&gt;&#xd;
+</description>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <hudson.plugins.googlecode.GoogleCodeProjectProperty plugin="googlecode@1.7"/>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <hudson.model.ChoiceParameterDefinition>
+          <name>REPOSITORY</name>
+          <description></description>
+          <choices class="java.util.Arrays$ArrayList">
+            <a class="string-array">
+              <string>https://github.com/telefonicaid/fiware-monitoring.git</string>
+              <string>https://github.com/fiware/fiware-monitoring.git</string>
+            </a>
+          </choices>
+        </hudson.model.ChoiceParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>BRANCH</name>
+          <description></description>
+          <defaultValue>develop</defaultValue>
+        </hudson.model.StringParameterDefinition>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+    <hudson.plugins.sidebar__link.ProjectLinks plugin="sidebar-link@1.6">
+      <links>
+        <hudson.plugins.sidebar__link.LinkAction>
+          <url>/../sonar/dashboard/index/com.telefonica.fiware:fiware-monitoring-ngsi-adapter</url>
+          <text>Sonar</text>
+          <icon>gear2.gif</icon>
+        </hudson.plugins.sidebar__link.LinkAction>
+      </links>
+    </hudson.plugins.sidebar__link.ProjectLinks>
+    <hudson.plugins.disk__usage.DiskUsageProperty plugin="disk-usage@0.22">
+      <diskUsageWithoutBuilds>87885021</diskUsageWithoutBuilds>
+      <slaveWorkspacesUsage class="concurrent-hash-map">
+        <entry>
+          <string></string>
+          <concurrent-hash-map>
+            <entry>
+              <string>/home/develenv/app/hudson/jobs/fiware-monitoring-ngsi-adapter-build/workspace</string>
+              <long>37448083</long>
+            </entry>
+          </concurrent-hash-map>
+        </entry>
+      </slaveWorkspacesUsage>
+    </hudson.plugins.disk__usage.DiskUsageProperty>
+  </properties>
+  <scm class="hudson.plugins.git.GitSCM" plugin="git@2.0">
+    <configVersion>2</configVersion>
+    <userRemoteConfigs>
+      <hudson.plugins.git.UserRemoteConfig>
+        <url>$REPOSITORY</url>
+      </hudson.plugins.git.UserRemoteConfig>
+    </userRemoteConfigs>
+    <branches>
+      <hudson.plugins.git.BranchSpec>
+        <name>$BRANCH</name>
+      </hudson.plugins.git.BranchSpec>
+    </branches>
+    <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+    <submoduleCfg class="list"/>
+    <extensions/>
+  </scm>
+  <canRoam>true</canRoam>
+  <disabled>false</disabled>
+  <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
+  <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
+  <triggers>
+    <hudson.triggers.TimerTrigger>
+      <spec>@midnight</spec>
+    </hudson.triggers.TimerTrigger>
+  </triggers>
+  <concurrentBuild>false</concurrentBuild>
+  <builders>
+    <hudson.tasks.Shell>
+      <command>ngsi_adapter/script/build/jenkins.sh build
+</command>
+    </hudson.tasks.Shell>
+  </builders>
+  <publishers>
+    <hudson.plugins.cobertura.CoberturaPublisher plugin="cobertura@1.9.3">
+      <coberturaReportFile>**/report/coverage/cobertura-coverage.xml</coberturaReportFile>
+      <onlyStable>false</onlyStable>
+      <failUnhealthy>false</failUnhealthy>
+      <failUnstable>false</failUnstable>
+      <autoUpdateHealth>false</autoUpdateHealth>
+      <autoUpdateStability>false</autoUpdateStability>
+      <zoomCoverageChart>false</zoomCoverageChart>
+      <maxNumberOfBuilds>0</maxNumberOfBuilds>
+      <failNoReports>true</failNoReports>
+      <healthyTarget>
+        <targets class="enum-map" enum-type="hudson.plugins.cobertura.targets.CoverageMetric">
+          <entry>
+            <hudson.plugins.cobertura.targets.CoverageMetric>METHOD</hudson.plugins.cobertura.targets.CoverageMetric>
+            <int>8000000</int>
+          </entry>
+          <entry>
+            <hudson.plugins.cobertura.targets.CoverageMetric>LINE</hudson.plugins.cobertura.targets.CoverageMetric>
+            <int>8000000</int>
+          </entry>
+          <entry>
+            <hudson.plugins.cobertura.targets.CoverageMetric>CONDITIONAL</hudson.plugins.cobertura.targets.CoverageMetric>
+            <int>7000000</int>
+          </entry>
+        </targets>
+      </healthyTarget>
+      <unhealthyTarget>
+        <targets class="enum-map" enum-type="hudson.plugins.cobertura.targets.CoverageMetric">
+          <entry>
+            <hudson.plugins.cobertura.targets.CoverageMetric>METHOD</hudson.plugins.cobertura.targets.CoverageMetric>
+            <int>0</int>
+          </entry>
+          <entry>
+            <hudson.plugins.cobertura.targets.CoverageMetric>LINE</hudson.plugins.cobertura.targets.CoverageMetric>
+            <int>0</int>
+          </entry>
+          <entry>
+            <hudson.plugins.cobertura.targets.CoverageMetric>CONDITIONAL</hudson.plugins.cobertura.targets.CoverageMetric>
+            <int>0</int>
+          </entry>
+        </targets>
+      </unhealthyTarget>
+      <failingTarget>
+        <targets class="enum-map" enum-type="hudson.plugins.cobertura.targets.CoverageMetric">
+          <entry>
+            <hudson.plugins.cobertura.targets.CoverageMetric>METHOD</hudson.plugins.cobertura.targets.CoverageMetric>
+            <int>0</int>
+          </entry>
+          <entry>
+            <hudson.plugins.cobertura.targets.CoverageMetric>LINE</hudson.plugins.cobertura.targets.CoverageMetric>
+            <int>0</int>
+          </entry>
+          <entry>
+            <hudson.plugins.cobertura.targets.CoverageMetric>CONDITIONAL</hudson.plugins.cobertura.targets.CoverageMetric>
+            <int>0</int>
+          </entry>
+        </targets>
+      </failingTarget>
+      <sourceEncoding>ASCII</sourceEncoding>
+    </hudson.plugins.cobertura.CoberturaPublisher>
+    <hudson.tasks.junit.JUnitResultArchiver>
+      <testResults>**/report/test/TEST-xunit.xml</testResults>
+      <keepLongStdio>false</keepLongStdio>
+      <testDataPublishers/>
+    </hudson.tasks.junit.JUnitResultArchiver>
+    <hudson.tasks.BuildTrigger>
+      <childProjects>fiware-monitoring-ngsi-adapter-deploy-deb</childProjects>
+      <threshold>
+        <name>SUCCESS</name>
+        <ordinal>0</ordinal>
+        <color>BLUE</color>
+        <completeBuild>true</completeBuild>
+      </threshold>
+    </hudson.tasks.BuildTrigger>
+  </publishers>
+  <buildWrappers>
+    <hudson.plugins.ansicolor.AnsiColorBuildWrapper plugin="ansicolor@0.3.1">
+      <colorMapName>xterm</colorMapName>
+    </hudson.plugins.ansicolor.AnsiColorBuildWrapper>
+  </buildWrappers>
+</project>
diff --git a/ngsi_adapter/script/build/files/jenkins/fiware-monitoring-ngsi-adapter-deploy-deb.xml b/ngsi_adapter/script/build/files/jenkins/fiware-monitoring-ngsi-adapter-deploy-deb.xml
@@ -0,0 +1,93 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+  <actions/>
+  <description>&lt;a href=&quot;https://github.com/telefonicaid/fiware-monitoring/tree/develop/ngsi_adapter&quot;&gt;&#xd;
+FIWARE Monitoring GE: NGSI Adapter (Ubuntu package)&#xd;
+&lt;/a&gt;&#xd;
+&lt;br&gt;&lt;br&gt;&lt;img src=&quot;/../jenkins/job/fiware-monitoring-ngsi-adapter-deploy-deb/badge/icon&quot;&gt;&#xd;
+</description>
+  <logRotator class="hudson.tasks.LogRotator">
+    <daysToKeep>-1</daysToKeep>
+    <numToKeep>10</numToKeep>
+    <artifactDaysToKeep>-1</artifactDaysToKeep>
+    <artifactNumToKeep>-1</artifactNumToKeep>
+  </logRotator>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <hudson.plugins.googlecode.GoogleCodeProjectProperty plugin="googlecode@1.7"/>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <hudson.model.ChoiceParameterDefinition>
+          <name>REPOSITORY</name>
+          <description></description>
+          <choices class="java.util.Arrays$ArrayList">
+            <a class="string-array">
+              <string>https://github.com/telefonicaid/fiware-monitoring.git</string>
+              <string>https://github.com/fiware/fiware-monitoring.git</string>
+            </a>
+          </choices>
+        </hudson.model.ChoiceParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>BRANCH</name>
+          <description></description>
+          <defaultValue>develop</defaultValue>
+        </hudson.model.StringParameterDefinition>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+    <hudson.plugins.disk__usage.DiskUsageProperty plugin="disk-usage@0.22">
+      <diskUsageWithoutBuilds>4719774</diskUsageWithoutBuilds>
+      <slaveWorkspacesUsage class="concurrent-hash-map">
+        <entry>
+          <string>ci-fiware-ubunt-01.hi.inet</string>
+          <concurrent-hash-map>
+            <entry>
+              <string>/home/develenv/workspace/fiware-monitoring-ngsi-adapter-deploy-deb</string>
+              <long>1328501</long>
+            </entry>
+          </concurrent-hash-map>
+        </entry>
+      </slaveWorkspacesUsage>
+    </hudson.plugins.disk__usage.DiskUsageProperty>
+  </properties>
+  <scm class="hudson.plugins.git.GitSCM" plugin="git@2.0">
+    <configVersion>2</configVersion>
+    <userRemoteConfigs>
+      <hudson.plugins.git.UserRemoteConfig>
+        <url>$REPOSITORY</url>
+      </hudson.plugins.git.UserRemoteConfig>
+    </userRemoteConfigs>
+    <branches>
+      <hudson.plugins.git.BranchSpec>
+        <name>$BRANCH</name>
+      </hudson.plugins.git.BranchSpec>
+    </branches>
+    <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+    <submoduleCfg class="list"/>
+    <extensions/>
+  </scm>
+  <assignedNode>ci-fiware-ubunt-01.hi.inet</assignedNode>
+  <canRoam>false</canRoam>
+  <disabled>false</disabled>
+  <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
+  <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
+  <triggers/>
+  <concurrentBuild>false</concurrentBuild>
+  <builders>
+    <hudson.tasks.Shell>
+      <command>ngsi_adapter/script/build/jenkins.sh release
+</command>
+    </hudson.tasks.Shell>
+  </builders>
+  <publishers>
+    <hudson.tasks.ArtifactArchiver>
+      <artifacts>**/*.deb</artifacts>
+      <latestOnly>false</latestOnly>
+      <allowEmptyArchive>false</allowEmptyArchive>
+    </hudson.tasks.ArtifactArchiver>
+  </publishers>
+  <buildWrappers>
+    <hudson.plugins.ansicolor.AnsiColorBuildWrapper plugin="ansicolor@0.3.1">
+      <colorMapName>xterm</colorMapName>
+    </hudson.plugins.ansicolor.AnsiColorBuildWrapper>
+  </buildWrappers>
+</project>
diff --git a/ngsi_adapter/script/build/jenkins.sh b/ngsi_adapter/script/build/jenkins.sh
@@ -27,8 +27,8 @@
 #     -h, --help	show this help message
 #
 # Actions:
-#     build		build, reports generation and SonarQube processing
-#     release		distribution package generation
+#     build		build, generate reports and publish to SonarQube
+#     release		generate distribution package
 #
 
 OPTS='h(help)'
@@ -86,8 +86,14 @@ COVERAGE_REPORT_DIR=$PROJECT_BASE_DIR/report/coverage
 COVERAGE_SITE_DIR=$PROJECT_BASE_DIR/site/coverage/lcov-report
 
 # Properties
-PROJECT_VERSION=$(sed -n '/"version"/ {s/.*:.*"\(.*\)".*/\1/; p}' $PROJECT_BASE_DIR/package.json)
-PRODUCT_RELEASE=4.1.1
+PRODUCT_INFO=$(awk '/"product"/,/\}/' $PROJECT_BASE_DIR/package.json)
+PRODUCT_AREA=$(echo "$PRODUCT_INFO" | sed -n '/"area"/ {s/.*:.*"\(.*\)".*/\1/; p; q}')
+PRODUCT_NAME=$(echo "$PRODUCT_INFO" | sed -n '/"name"/ {s/.*:.*"\(.*\)".*/\1/; p; q}')
+PRODUCT_RELEASE=$(echo "$PRODUCT_INFO" | sed -n '/"release"/ {s/.*:.*"\(.*\)".*/\1/; p; q}')
+PROJECT_NAME=$(sed -n '/"name"/ {s/.*:.*"\(.*\)".*/\1/; p; q}' $PROJECT_BASE_DIR/package.json)
+PROJECT_VERSION=$(sed -n '/"version"/ {s/.*:.*"\(.*\)".*/\1/; p; q}' $PROJECT_BASE_DIR/package.json)
+SONAR_PROJECT_NAME=$(echo "$PRODUCT_NAME-$PROJECT_NAME" | tr '_' '-')
+SONAR_PROJECT_KEY=com.telefonica.fiware:$SONAR_PROJECT_NAME
 
 # Change to project directory
 cd $PROJECT_BASE_DIR
@@ -104,11 +110,11 @@ build)
 
 	# Prepare properties file for SonarQube (awk to remove leading spaces)
 	awk '$1=$1' > $PROJECT_BASE_DIR/sonar-project.properties <<-EOF
-		product.area.name=iotplatform
-		product.name=fiware-monitoring
+		product.area.name=$PRODUCT_AREA
+		product.name=$PRODUCT_NAME
 		product.release=$PRODUCT_RELEASE
-		sonar.projectName=fiware-monitoring-ngsi-adapter
-		sonar.projectKey=com.telefonica.fiware:fiware-monitoring-ngsi-adapter
+		sonar.projectName=$SONAR_PROJECT_NAME
+		sonar.projectKey=$SONAR_PROJECT_KEY
 		sonar.projectVersion=$PROJECT_VERSION
 		sonar.language=js
 		sonar.sourceEncoding=UTF-8

diff --git a/ngsi_adapter/src/package.json b/ngsi_adapter/src/package.json
@@ -1,14 +1,28 @@
 {
-  "version": "1.2.0",
+  "version": "1.2.1",
   "name": "ngsi_adapter",
-  "main": "lib/adapter.js",
   "description": "Generic NGSI Probe Adapter",
+  "product": {
+    "name": "fiware-monitoring",
+    "area": "iotplatform",
+    "release": "4.2.1"
+  },
   "keywords": [
     "FIWARE",
     "Monitoring",
     "NGSI"
   ],
   "author": "Telefónica I+D",
+  "license": "Apache License 2.0",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/telefonicaid/fiware-monitoring.git"
+  },
+  "main": "lib/adapter.js",
+  "scripts": {
+    "start": "adapter",
+    "test": "grunt test"
+  },
   "engines": {
     "node": ">=0.10.18"
   },
@@ -39,14 +53,5 @@
     "istanbul": "~0.1.34",
     "proxyquire": "0.5.1",
     "dev-null": "0.1.1"
-  },
-  "scripts": {
-    "start": "adapter",
-    "test": "grunt test"
-  },
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/telefonicaid/fiware-monitoring.git"
-  },
-  "license": "Apache License 2.0"
+  }
 }
diff --git a/ngsi_event_broker/configure.ac b/ngsi_event_broker/configure.ac
@@ -1,5 +1,8 @@
 # Autoconf initialization.
-AC_INIT(fiware-monitoring-ngsi-event-broker, 1.4.0)
+m4_define([PRODUCT_NAME], [fiware-monitoring])
+m4_define([PRODUCT_AREA], [iotplatform])
+m4_define([PRODUCT_RELEASE], [4.2.1])
+AC_INIT([PRODUCT_NAME-ngsi-event-broker], 1.4.1)
 AC_LANG(C)
 if test -z "$CFLAGS"; then
    # prevent configure from assigning default flags
@@ -56,6 +59,10 @@ AC_ARG_WITH(nagios-srcdir,
    nagios_srcdir=/usr/local/src/nagios)
 AC_SUBST([NAGIOS_SRCDIR],[$nagios_srcdir])
 if test -d $nagios_srcdir/include; then
+   # Current and required Nagios versions
+   nagios_common=$nagios_srcdir/include/common.h
+   nagios_curver=$(awk -F'"' '/PROGRAM_VERSION/ {print $2}' $nagios_common)
+   nagios_reqver=3.4.1
    # Directory where Nagios headers are copied
    nagios_incdir=contrib/nagios/include
    mkdir -p $nagios_incdir
@@ -66,7 +73,7 @@ if test -d $nagios_srcdir/include; then
 fi
 
 # Library version spec (major:minor:revision).
-VERSION_SPEC=$(echo $VERSION | sed 's/\./:/g')
+VERSION_SPEC=$(echo $PACKAGE_VERSION | sed 's/\./:/g')
 AC_SUBST([VERSION_SPEC])
 
 # Package specification attributes.
@@ -94,6 +101,8 @@ AC_CACHE_CHECK([for Nagios sources],
    my_cv_nagios_sources=$nagios_srcdir, my_cv_nagios_sources=no)])
 if test "$my_cv_nagios_sources" = "no"; then
    AC_MSG_ERROR([cannot find sources (use --with-nagios-srcdir option)])
+elif test $(printf "$nagios_reqver\n$nagios_curver" | sort -V | head -1) != $nagios_reqver; then
+   AC_MSG_ERROR([Nagios sources of version $nagios_reqver or greater required])
 fi
 
 # Checks for header files.