Merge pull request #3178 from atanas-vladimirov/json

upsc: Add -j option for JSON output

Author: jimklimov

Makefile.am

@@ -208,7 +208,7 @@ SUBDIR_TGT_RULE = ( \
 all-libs-local/include:
 	+@$(SUBDIR_TGT_RULE)
 
-### Delivers: libcommon.la libcommonclient.la libcommonstr.la
+### Delivers: libcommon.la libcommonclient.la libcommonstr.la libcommonstrjson.la
 ###           (consume only one of these at a time!)
 ### Delivers: libcommonversion.la (only version methods)
 ### Delivers: libparseconf.la libnutconf.la libnutwincompat.la
@@ -329,6 +329,7 @@ all/common: all/include all-libs-local/common
 ### Requires-ext: common/libcommon.la common/libcommonclient.la
 ### Requires-ext: common/libparseconf.la
 ### Requires-ext: common/libcommonversion.la
+### Requires-ext: common/libcommonstrjson.la
 ### Requires-int: libupsclient.la
 all/clients: all/common all-libs-local/clients
 	+@$(SUBDIR_TGT_RULE)

NEWS.adoc

@@ -198,6 +198,8 @@ NOTE: If using `upssched` and monitoring multiple UPSes, consider setting up
 a `START-TIMER-SHARED` rule with a short (approx. 1 second) timeout to group
 several `FSD` notifications into one executed action. [PR #3097]
 
+ - `upsc` has now optional JSON output [issue #3172, PR #3178]
+
  - `upsset` should now recognize `RANGE NUMBER` and `NUMBER` types. [#3164]
 
  - `upsstats` has now JSON output mode via `?json` (or `&json`) CGI query

clients/Makefile.am

@@ -21,6 +21,7 @@ AM_CXXFLAGS = -DHAVE_NUTCOMMON=1 -I$(top_srcdir)/include
 $(top_builddir)/common/libcommon.la \
 $(top_builddir)/common/libcommonclient.la \
 $(top_builddir)/common/libcommonversion.la \
+$(top_builddir)/common/libcommonstrjson.la \
 $(top_builddir)/common/libparseconf.la: dummy
 	+@cd $(@D) && $(MAKE) $(AM_MAKEFLAGS) $(@F)
 
@@ -91,6 +92,7 @@ if WITH_CGI
 endif WITH_CGI
 
 upsc_SOURCES = upsc.c upsclient.h
+upsc_LDADD = $(LDADD_CLIENT) $(top_builddir)/common/libcommonstrjson.la
 upscmd_SOURCES = upscmd.c upsclient.h
 upsrw_SOURCES = upsrw.c upsclient.h
 upslog_SOURCES = upslog.c upsclient.h upslog.h
@@ -114,6 +116,7 @@ upsimage_cgi_LDADD = $(LDADD) $(LIBGD_LDFLAGS)
 upsset_cgi_SOURCES = upsset.c upsclient.h cgilib.c cgilib.h
 upsstats_cgi_SOURCES = upsstats.c upsclient.h status.h upsstats.h	\
  upsimagearg.h cgilib.c cgilib.h
+upsstats_cgi_LDADD = $(LDADD_CLIENT) $(top_builddir)/common/libcommonstrjson.la
 
 # not LDADD... why?
 libupsclient_la_SOURCES = upsclient.c upsclient.h