Merge pull request #1740 from simonnagl/feature/version

Add version to /api/v1/charts

diff --git a/configure.ac b/configure.ac
index 0005ec551aa6e8f20a322ae217138888c2a1e572..20a74696baf00eba6ad85a83ecc2c54e51b19306 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -7,12 +7,15 @@ define([VERSION_MAJOR], [1])
 define([VERSION_MINOR], [5])
 define([VERSION_FIX], [1])
 define([VERSION_NUMBER], VERSION_MAJOR[.]VERSION_MINOR[.]VERSION_FIX)
-define([VERSION_SUFFIX], [_master])
+define([VERSION_SUFFIX], [_rolling])
 
 dnl Set to "1" for a first RPM release of a new version
 PACKAGE_RPM_RELEASE="0.0.$(echo VERSION_SUFFIX | sed s/^_//)"
 
-AC_INIT([netdata], VERSION_NUMBER[]VERSION_SUFFIX)
+define([VERSION_STRING], m4_esyscmd_s(git describe 2>/dev/null | sed 's/^v//'))
+m4_ifval(VERSION_STRING, [], [define([VERSION_STRING], VERSION_NUMBER)])
+
+AC_INIT([netdata], VERSION_STRING[]VERSION_SUFFIX)
 
 AM_MAINTAINER_MODE([disable])
 if test x"$USE_MAINTAINER_MODE" = xyes; then

diff --git a/packaging/update-tags b/packaging/update-tags
index 6823fce1cbd1c5936835b3b3f0cfe36ad9984b19..f2d641b3b940b655315c21c0537441042abf9d13 100755 (executable)
--- a/packaging/update-tags
+++ b/packaging/update-tags
@@ -135,7 +135,7 @@ then
   fi
 
   echo "Resetting suffix in configure.ac:"
-  sed -i -e 's/define(\[VERSION_SUFFIX\], \[.*])/define([VERSION_SUFFIX], [_master])/' configure.ac
+  sed -i -e 's/define(\[VERSION_SUFFIX\], \[.*])/define([VERSION_SUFFIX], [_rolling])/' configure.ac
   sed -i -e 's:^PACKAGE_RPM_RELEASE=.*:PACKAGE_RPM_RELEASE="0.0.$(echo VERSION_SUFFIX | sed s/^_//)":' configure.ac
 
   echo "Committing new configure.ac:"

diff --git a/src/common.c b/src/common.c
index 92a7899471705933e4f61e0fe9a6fdc35740e52f..e3682e87718d6fb2a8e74d78c27d30b54a69b2fa 100644 (file)
--- a/src/common.c
+++ b/src/common.c
@@ -13,6 +13,7 @@ int enable_ksm = 1;
 
 volatile sig_atomic_t netdata_exit = 0;
 const char *os_type = NETDATA_OS_TYPE;
+const char *program_version = VERSION;
 
 // ----------------------------------------------------------------------------
 // memory allocation functions that handle failures

diff --git a/src/common.h b/src/common.h
index 143578bd3c64f36a9ce25bbd01210d356d20f709..e781d47bcc830461b0745fe4b0dc66d9167b88e0 100644 (file)
--- a/src/common.h
+++ b/src/common.h
@@ -277,6 +277,8 @@ extern void get_system_HZ(void);
 extern volatile sig_atomic_t netdata_exit;
 extern const char *os_type;
 
+extern const char *program_version;
+
 /* fix for alpine linux */
 #ifndef RUSAGE_THREAD
 #ifdef RUSAGE_CHILDREN

diff --git a/src/main.c b/src/main.c
index d73c15a86c6eda3b2035a289e0a74b97ff626a59..e453107b8b0cdebb1062fad5aaa343b303d0f4dc 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -434,8 +434,7 @@ int main(int argc, char **argv)
                     config_set("global", "run as user", optarg);
                     break;
                 case 'v':
-                    // TODO: Outsource version to makefile which can compute version from git.
-                    printf("netdata %s\n", VERSION);
+                    printf("%s %s\n", program_name, program_version);
                     return 0;
                 case 'W':
                     {

diff --git a/src/rrd2json.c b/src/rrd2json.c
index 904b606498efa556a85b1eaf1d7755f08621cf75..b886b25fd29954cc695c05349bc51fc6e307de2c 100644 (file)
--- a/src/rrd2json.c
+++ b/src/rrd2json.c
@@ -85,11 +85,13 @@ void rrd_stats_api_v1_charts(BUFFER *wb)
 
     buffer_sprintf(wb, "{\n"
            "\t\"hostname\": \"%s\""
+        ",\n\t\"version\": \"%s\""
         ",\n\t\"os\": \"%s\""
         ",\n\t\"update_every\": %d"
         ",\n\t\"history\": %d"
         ",\n\t\"charts\": {"
         , localhost.hostname
+        , program_version
         , os_type
         , rrd_update_every
         , rrd_default_history_entries