[DO NOT MERGE] branch comparison

Jenkinsfile

@@ -1,6 +1,6 @@
 import java.text.SimpleDateFormat
 jobName = "metadata-exporter"
-version = "0.1.66"
+version = "0.1.68"
 build_dir = "build"
 buildPackageName = "meta-exporter"
 
@@ -11,7 +11,7 @@ node {
         git branch: 'master', url: 'git@github.com:MONROE-PROJECT/Utilities.git'
 
         checkout([$class: 'GitSCM',
-            branches: [[name: 'nne-iot']],
+            branches: [[name: 'test-merge-ubus']],
             doGenerateSubmoduleConfigurations: false,
             extensions: [[$class: 'RelativeTargetDirectory', relativeTargetDir: 'metadata-exporter-alt']],
             submoduleCfg: [],
@@ -33,39 +33,50 @@ node {
                 userRemoteConfigs: [[url: 'git@github.com:Celerway/celerway-jenkins.git']]])
     }
 
-    docker.withRegistry('http://registry:5000') {
-        docker.image('registry:5000/jenkins-slave:monroe').inside('-u jenkins') {
+        withDockerRegistry(credentialsId: 'gcr:nimbus-tools-gcr', url: 'http://eu.gcr.io/nimbus-tools') {
+            docker.image('eu.gcr.io/nimbus-tools/monroe-builder:stretch').inside('-u jenkins') {
+                stage ('Install libubox') {
+                    copyArtifacts filter: '**/*.deb', fingerprintArtifacts: true, projectName: 'monroe/libubox', selector: lastSuccessful()
+                    sh '''sudo find . -name "*.deb" -exec dpkg -i {} \\;'''
+                    sh "rm libubox_*_amd64.deb"
+                }
 
-	    stage ('Build') {
-		dir(build_dir) {
-		    sh "cmake ../metadata-exporter-alt -DNNE=1 -DSQLITE3=1 -DZEROMQ_INPUT=1 -DZEROMQ_WRITER=1 -DZEROMQ_RELAY=1 -DGPS_NSB=1 -DMUNIN=1 -DSYSEVENT=1 -DNEAT=1 && make && make package"
-		}
-		sh "chmod +x versionize/versionize.sh; cp versionize/versionize.sh build/"
-                sh "chmod -R g-s ${build_dir}"
-		dir(build_dir) {
-		    sh "mv meta_exporter-0.1.0-Linux.deb meta-exporter-0.1.0-Linux.deb"
-		    sh "./versionize.sh meta-exporter-0.1.0-Linux.deb ${buildPackageName} ${version} ${shortCommit} || true"
-		    sh "rm meta-exporter-0.1.0-Linux.deb"
-		}
-	    }
+                stage ('Install libubus') {
+                    step([$class: 'CopyArtifact', filter: '**/*.deb', fingerprintArtifacts: true, projectName: 'monroe/ubus', selector: [$class: 'StatusBuildSelector', stable: false]])
+                    sh '''sudo find . -name "*.deb" -exec dpkg -i {} \\;'''
+                    sh "rm ubusd_*_amd64.deb"
+                }
 
-	    stage ('Configure') {
-		dir(build_dir) {
-		    sh """echo `cat pk_${buildPackageName}/DEBIAN/control |grep Version|sed -e 's/Version: //'` > pkgver"""
-		}
-		sh """cp -an metadata-exporter/* build/pk_${buildPackageName}/"""
-		dir(build_dir) {
-		    sh """sed -i -e 's/${buildPackageName}/metadata-exporter/g' pk_${buildPackageName}/DEBIAN/md5sums pk_${buildPackageName}/DEBIAN/control"""
-		    sh """mkdir -p pk_${buildPackageName}/usr/sbin && mv pk_${buildPackageName}/usr/sbin/meta_exporter pk_${buildPackageName}/usr/sbin/metadata-exporter"""
-                    sh "chmod -R g-s pk_meta-exporter"
-		    sh '''PKGVER=`cat pkgver` ;dpkg -b pk_meta-exporter metadata-exporter-${PKGVER}-Linux.deb'''
-		    sh "rm meta-exporter*.deb"
-		}
-	    }
+          	    stage ('Build') {
+ 	                	dir(build_dir) {
+		                    sh "cmake ../metadata-exporter-alt/src -DNNE=1 -DSQLITE3=1 -DZEROMQ_INPUT=1 -DZEROMQ_WRITER=1 -DZEROMQ_RELAY=1 -DGPS_NSB=1 -DMUNIN=1 -DSYSEVENT=1 -DNEAT=1 -DUBUS=1 && make && make package"
+		                }
+		                sh "chmod +x versionize/versionize.sh; cp versionize/versionize.sh build/"
+                    sh "chmod -R g-s ${build_dir}"
+		                dir(build_dir) {
+		                    sh "mv meta_exporter-0.1.0-Linux.deb meta-exporter-0.1.0-Linux.deb"
+		                    sh "./versionize.sh meta-exporter-0.1.0-Linux.deb ${buildPackageName} ${version} ${shortCommit} || true"
+		                    sh "rm meta-exporter-0.1.0-Linux.deb"
+		                }
+	              }
 
-	    stage ('Archive artifacts') {
-		archiveArtifacts "${build_dir}/*.deb"
-            }
+                stage ('Configure') {
+                  dir(build_dir) {
+                      sh """echo `cat pk_${buildPackageName}/DEBIAN/control |grep Version|sed -e 's/Version: //'` > pkgver"""
+                  }
+                  sh """cp -an metadata-exporter/* build/pk_${buildPackageName}/"""
+                  dir(build_dir) {
+                      sh """sed -i -e 's/${buildPackageName}/metadata-exporter/g' pk_${buildPackageName}/DEBIAN/md5sums pk_${buildPackageName}/DEBIAN/control"""
+                      sh """mkdir -p pk_${buildPackageName}/usr/sbin && mv pk_${buildPackageName}/usr/sbin/meta_exporter pk_${buildPackageName}/usr/sbin/metadata-exporter"""
+                      sh "chmod -R g-s pk_meta-exporter"
+                      sh '''PKGVER=`cat pkgver` ;dpkg -b pk_meta-exporter metadata-exporter-${PKGVER}-Linux.deb'''
+                      sh "rm meta-exporter*.deb"
+                  }
+                }
+
+                stage ('Archive artifacts') {
+                    archiveArtifacts "${build_dir}/*.deb"
+                }
         }
     }
 }

Makefile

@@ -0,0 +1,47 @@
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=data-exporter
+PKG_VERSION:=2021-12-13
+PKG_RELEASE=1.4
+
+CMAKE_INSTALL:=1
+
+PKG_LICENSE:=LGPLv2.1
+PKG_LICENSE_FILES:=
+
+PKG_MAINTAINER:=Lukasz Baj <l.baj@celerway.com>
+PKG_BUILD_PARALLEL:=1
+
+COMMIT_NO := $(shell git log --pretty=%H -1)
+CMAKE_OPTIONS += -DVER=$(COMMIT_NO)
+
+include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/cmake.mk
+
+define Build/Prepare
+	mkdir -p $(PKG_BUILD_DIR)
+	cp -r src/* $(PKG_BUILD_DIR)/
+endef
+
+define Package/data-exporter
+  SECTION:=celerway
+  CATEGORY:=Celerway
+  DEPENDS:=+libjson-c +libmnl +libsqlite3 +libpthread +libuci +libubus +libubox
+  TITLE:=Utility for exporting metadata
+endef
+
+TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include
+CMAKE_OPTIONS += -DTARGET_OWRT=1 -DSQLITE3=1 -DFILE=1 -DUBUS=1
+
+define Package/data-exporter/install
+	$(INSTALL_DIR) $(1)/bin
+	$(CP) $(PKG_INSTALL_DIR)/usr/bin/meta_exporter $(1)/bin/
+	$(INSTALL_BIN) ./files/metadata_exporter_timeloop.sh $(1)/bin/
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_BIN) ./files/metadata.init $(1)/etc/init.d/metadata
+	$(INSTALL_BIN) ./files/metadataloop.init $(1)/etc/init.d/metadataloop
+	$(INSTALL_DIR) $(1)/etc/config
+	$(INSTALL_BIN) ./files/metadata.config $(1)/etc/config/metadata
+endef
+
+$(eval $(call BuildPackage,data-exporter))

files/metadata.config

@@ -0,0 +1,3 @@
+config section metadata
+    option version '2'
+    option disabled '0'

files/metadata.init

@@ -0,0 +1,113 @@
+#!/bin/sh /etc/rc.common
+
+. /lib/config/uci.sh
+. /usr/share/libubox/jshn.sh
+
+START=96
+
+METADATAPATH="/bin"
+METADATANAME="meta_exporter"
+METADATADB="/tmp/metadata.db"
+METADATAPREFIX="/tmp/metatemp"
+USAGEPREFIX="/tmp/usage"
+GPSPREFIX="/tmp/metadata-gps"
+CONF_PATH="/tmp/meta_exporter.conf"
+SESSION_ID_PATH="/tmp/bootcnt"
+TSTAMP_DUMP_PATH="/tmp/last_conn_tstamp"
+USE_PROCD=1
+
+create_config()
+{
+    METADATANODEID=$(uci_get backend inventory id)
+    API_VERSION=$(uci_get backend inventory api_version)
+    SQLITE_INTERVAL=$(uci_get backend metadata sqlite_interval)
+    SQLITE_EVENTS=$(uci_get backend metadata sqlite_events)
+    EXPORT_GPS=$(uci_get cwy_router_settings metadata export_gps 1)
+    #The reason we use the default board name here, is that we need to separate between old and new Arcus. The new Arcus
+    #have a valid identifier stored in the DMI
+    BOARD_NAME=`cat /tmp/sysinfo/board_name`
+
+    if [ -z "$METADATANODEID" ]; then
+        METADATANODEID=0
+    fi
+
+    if [ -z "$API_VERSION" ];
+    then
+        API_VERSION=2
+    fi
+
+    json_init
+
+    #Add zmq options
+    json_add_object "ubus_input"
+        json_add_boolean "conn" 1
+
+        if [ "$EXPORT_GPS" -eq 1 ];
+        then
+            json_add_boolean "pos" 1
+        fi
+    json_close_object
+
+    json_add_object "sqlite"
+        json_add_string "database" "$METADATADB"
+        json_add_int "nodeid" "$METADATANODEID"
+        json_add_string "meta_prefix" "$METADATAPREFIX"
+        json_add_string "usage_prefix" "$USAGEPREFIX"
+
+        if [ "$EXPORT_GPS" -eq 1 ];
+        then
+            json_add_string "gps_prefix" "$GPSPREFIX"
+        fi
+
+        json_add_string "session_id" "$SESSION_ID_PATH"
+        json_add_int "api_version" "$API_VERSION"
+
+        if [ -n "$SQLITE_INTERVAL" ];
+        then
+            json_add_int "interval" "$SQLITE_INTERVAL"
+        fi
+
+        if [ -n "$SQLITE_EVENTS" ];
+        then
+            json_add_int "events" "$SQLITE_EVENTS"
+        fi
+
+        json_add_string "last_conn_tstamp_path" "$TSTAMP_DUMP_PATH"
+        json_add_string "output_format" "json"
+        json_add_string "ntp_fix_file" "/tmp/ntp-fix-obtained"
+
+    json_close_object
+
+    if [ "$EXPORT_GPS" -eq 1 ];
+    then
+        if [ "$BOARD_NAME" == "celerway-arcus" ];
+        then
+            json_add_object "gpsd"
+                json_add_string "address" "127.0.0.1"
+                json_add_string "port" "2947"
+            json_close_object
+        fi
+    fi
+
+    echo "$(json_dump)" > "$CONF_PATH"
+}
+
+start_service()
+{
+    DISABLED=$(uci_get cwy_router_settings metadata disabled);
+
+    #Unless there is anywhere to store data, then don't run metadata collector.
+    #The reason for this check, is that we can avoid having to install metadata
+    #later. All we need to provide is a backend-config
+    if [ ! -f "/etc/config/backend" -o $DISABLED -eq 1 ];
+    then
+        exit 0;
+    fi
+
+    create_config
+
+    procd_open_instance
+    procd_set_param command "$METADATAPATH/$METADATANAME" -c "$CONF_PATH"
+    procd_set_param respawn 0 5 0
+    procd_close_instance
+}