Hi, here's an update to facette 0.4.0 - this version is able to communicate with influxdb, the old 0.3.0pre0 version we had apparently speaks an old version of the influxdb API/protocol.
Either way, i haven't found (yet) the right magic to use in pattern matching to make facette detect source/metrics in the influxdb "series/measurements" layout, but this new version still lists metrics fine from an rrd/collectd provider. Big caveat: configuration changed from json files (for graphs/collections/groups + config) to one yaml global config file + database (sqlite by default, psql/mysql if needed) to store graphs/collections/groups so if you update, you lose all your graphs/collections/groups definition, and no upgrade path is provided. And the upstream doc isn't really up to date yet :) Landry
? patch-Makefile Index: Makefile =================================================================== RCS file: /cvs/ports/sysutils/facette/Makefile,v retrieving revision 1.5 diff -u -r1.5 Makefile --- Makefile 27 May 2017 19:57:07 -0000 1.5 +++ Makefile 25 Dec 2017 09:23:53 -0000 @@ -2,26 +2,23 @@ COMMENT = time series data visualization and graphing software -DISTNAME = facette-0.3.1pre0 - GH_ACCOUNT = facette GH_PROJECT = facette -GH_COMMIT = 62f4bd9058f26e7f8ee800b925e4c76731b5b955 -REVISION = 2 +GH_TAGNAME = 0.4.0 CATEGORIES = sysutils HOMEPAGE = https://facette.io +# selfhosted node_modules deps generated via gmake node_modules DISTFILES = ${DISTNAME}${EXTRACT_SUFX}{${GH_COMMIT}${EXTRACT_SUFX}} \ - facette-0.3.1-node_modules${EXTRACT_SUFX}:0 + ${GH_PROJECT}-${GH_TAGNAME}-node_modules${EXTRACT_SUFX}:0 MASTER_SITES0 = https://rhaalovely.net/stuff/ # BSD PERMIT_PACKAGE_CDROM = Yes BUILD_DEPENDS = lang/go \ - textproc/gsed \ lang/node LIB_DEPENDS = net/rrdtool WANTLIB += c pthread rrd @@ -29,10 +26,14 @@ PORTHOME = ${WRKDIR} MAKE_ENV = CGO_LDFLAGS="-Wl,-rpath -Wl,${X11BASE}/lib" USE_GMAKE = Yes +SUBST_VARS += VARBASE post-patch: ln -s ${WRKDIR}/node_modules ${WRKSRC}/node_modules - ${SUBST_CMD} ${WRKSRC}/docs/examples/providers/collectd.json \ - ${WRKSRC}/docs/examples/facette.json + +post-install: + ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/facette/ + ${SUBST_CMD} -c ${WRKSRC}/docs/examples/facette.yaml \ + ${PREFIX}/share/examples/facette/facette.yaml .include <bsd.port.mk> Index: distinfo =================================================================== RCS file: /cvs/ports/sysutils/facette/distinfo,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 distinfo --- distinfo 30 Aug 2016 17:34:00 -0000 1.1.1.1 +++ distinfo 25 Dec 2017 09:23:53 -0000 @@ -1,4 +1,4 @@ -SHA256 (facette-0.3.1-node_modules.tar.gz) = CWZJpe7oUpY1ELt51HuXjNiI8G82HrHZdVNHOIIr5zU= -SHA256 (facette-0.3.1pre0.tar.gz) = QaAVYemjDAo2p/JEtZxnccB8yo4PrPPTvBMrb8CsFKY= -SIZE (facette-0.3.1-node_modules.tar.gz) = 1303343 -SIZE (facette-0.3.1pre0.tar.gz) = 3580134 +SHA256 (facette-0.4.0-node_modules.tar.gz) = J7/Pv2H3SAm05an2JrFQXph0GU0Jcrh6o3mU6GXtirk= +SHA256 (facette-0.4.0.tar.gz) = v9/dhTyDdzS43tsaCK5YqvQY0LnDFXvQgVDokUCEkX0= +SIZE (facette-0.4.0-node_modules.tar.gz) = 14345049 +SIZE (facette-0.4.0.tar.gz) = 7429172 Index: patches/patch-Makefile =================================================================== RCS file: /cvs/ports/sysutils/facette/patches/patch-Makefile,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 patch-Makefile --- patches/patch-Makefile 30 Aug 2016 17:34:00 -0000 1.1.1.1 +++ patches/patch-Makefile 25 Dec 2017 09:23:53 -0000 @@ -1,90 +1,38 @@ -$OpenBSD: patch-Makefile,v 1.1.1.1 2016/08/30 17:34:00 landry Exp $ +$OpenBSD$ -use gsed, otherwise messages.json is empty -dont use npm install -fix -X syntax -dont rebuild binary when installing -no pandoc, no manpages.. - ---- Makefile.orig Mon May 16 09:55:22 2016 -+++ Makefile Tue Aug 30 19:25:11 2016 -@@ -16,8 +16,7 @@ UNAME := $(shell uname -s) - - GO ?= go - --# might apply to other BSDs --ifeq ($(UNAME), NetBSD) -+ifeq ($(filter (OpenBSD NetBSD), $(UNAME)),) - SED = gsed - else - SED = sed -@@ -63,30 +62,14 @@ mesg_fail = (echo "result: $(shell tty -s && tput seta - - path_search = $(firstword $(wildcard $(addsuffix /$(1),$(subst :, ,$(PATH))))) - --npm_install = \ -- $(call mesg_start,main,Installing $(1) via npm...); \ -- $(NPM) install $(1) >/dev/null 2>&1 && \ -- $(call mesg_ok) || $(call mesg_fail) -- - all: build - - # npm scripts - lessc: -- @if [ -z "$(call path_search,$(LESSC))" ]; then \ -- $(call npm_install,$(NPM_LESSC)); \ -- $(call npm_install,$(NPM_LESSC_PLUGIN_CLEANCSS)); \ -- fi - - uglifyjs: -- @if [ -z "$(call path_search,$(UGLIFYJS))" ]; then \ -- $(call npm_install,$(NPM_UGLIFYJS)); \ -- fi - - jshint: -- @if [ -z "$(call path_search,$(JSHINT))" ]; then \ -- $(call npm_install,$(NPM_JSHINT)); \ -- fi -- - clean: clean-bin clean-doc clean-static clean-test clean-dist - @$(call mesg_start,clean,Cleaning source symlink...) - @rm -rf $(BUILD_DIR)/src && \ -@@ -128,12 +111,12 @@ PKG_LIST = $(wildcard pkg/*) +Index: Makefile +--- Makefile.orig ++++ Makefile +@@ -73,7 +73,7 @@ build-bin: build-dir + endif + @$(call mesg_start,build,Building binaries...) + @(for bin in $(BIN_LIST); do \ +- $(GO) build -i -v \ ++ $(GO) build -i -v -x \ + -tags "$(BUILD_TAGS)" \ + -ldflags "-s -w \ + -X main.version=$(VERSION) \ +@@ -83,7 +83,7 @@ endif + -o $(BUILD_DIR)/bin/$$bin ./src/cmd/$$bin || exit 1; \ + done) && $(call mesg_ok) || $(call mesg_fail) + +-build-assets: node_modules ++build-assets: + @$(call mesg_start,build,Building assets...) + @BUILD_DIR=$(BUILD_DIR) $(GULP) $(GULP_ARGS) build --env $(BUILD_ENV) >/dev/null && \ + $(call mesg_ok) || $(call mesg_fail) +@@ -112,12 +112,12 @@ test-bin: build-dir - $(BIN_OUTPUT): $(PKG_SRC) $(BIN_SRC) $(BUILD_DIR)/src/github.com/facette/facette - @$(call mesg_start,$(notdir $@),Building $(notdir $@)...) -- @install -d -m 0755 $(dir $@) && $(GO) build \ -+ @install -d -m 0755 $(dir $@) && $(GO) build -x \ - -ldflags " \ -- -X main.version $(VERSION) \ -- -X main.buildDate '$(BUILD_DATE)' \ -- $(PKG_LIST:%=-X github.com/facette/facette/%.version $(VERSION)) \ -- $(PKG_LIST:%=-X github.com/facette/facette/%.buildDate '$(BUILD_DATE)') \ -+ -X main.version=$(VERSION) \ -+ -X main.buildDate='$(BUILD_DATE)' \ -+ $(PKG_LIST:%=-X github.com/facette/facette/%.version=$(VERSION)) \ -+ $(PKG_LIST:%=-X github.com/facette/facette/%.buildDate='$(BUILD_DATE)') \ - " \ - -tags "$(TAGS)" \ - -o $@ cmd/$(notdir $@)/*.go && \ -@@ -147,7 +130,7 @@ clean-bin: - build-bin: $(BIN_OUTPUT) + install: install-bin install-assets install-docs - .PHONY: install-bin -install-bin: build-bin +install-bin: @$(call mesg_start,install,Installing binaries...) - @install -d -m 0755 $(PREFIX)/bin && cp $(BIN_OUTPUT) $(PREFIX)/bin && \ + @install -d -m 0755 $(PREFIX)/bin && install -m 0755 $(BUILD_DIR)/bin/* $(PREFIX)/bin/ && \ $(call mesg_ok) || $(call mesg_fail) -@@ -174,10 +157,7 @@ clean-doc: - build-doc: $(MAN_OUTPUT) - .PHONY: install-doc --install-doc: build-doc -- @$(call mesg_start,install,Installing manuals files...) -- @install -d -m 0755 $(PREFIX)/share && cp -Rp $(BUILD_DIR)/man $(PREFIX)/share && \ -- $(call mesg_ok) || $(call mesg_fail) -+install-doc: - @$(call mesg_start,install,Installing examples files...) - @install -d -m 0755 $(PREFIX)/share/facette/examples && cp -Rp docs/examples $(PREFIX)/share/facette && \ +-install-assets: build-assets ++install-assets: + @$(call mesg_start,install,Installing assets...) + @install -d -m 0755 $(PREFIX)/share/facette && cp -r $(BUILD_DIR)/assets $(PREFIX)/share/facette/ && \ $(call mesg_ok) || $(call mesg_fail) Index: patches/patch-docs_examples_facette_json =================================================================== RCS file: patches/patch-docs_examples_facette_json diff -N patches/patch-docs_examples_facette_json --- patches/patch-docs_examples_facette_json 30 Aug 2016 17:34:00 -0000 1.1.1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,12 +0,0 @@ -$OpenBSD: patch-docs_examples_facette_json,v 1.1.1.1 2016/08/30 17:34:00 landry Exp $ ---- docs/examples/facette.json.orig Mon May 16 09:55:22 2016 -+++ docs/examples/facette.json Tue Aug 30 19:23:05 2016 -@@ -2,6 +2,6 @@ - "bind": ":12003", - "base_dir": "/usr/local/share/facette", - "providers_dir": "/etc/facette/providers", -- "data_dir": "/var/lib/facette", -- "pid_file": "/var/run/facette/facette.pid" -+ "data_dir": "${LOCALSTATEDIR}/facette/data", -+ "pid_file": "${LOCALSTATEDIR}/facette/facette.pid" - } Index: patches/patch-docs_examples_facette_yaml =================================================================== RCS file: patches/patch-docs_examples_facette_yaml diff -N patches/patch-docs_examples_facette_yaml --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-docs_examples_facette_yaml 25 Dec 2017 09:23:53 -0000 @@ -0,0 +1,14 @@ +$OpenBSD$ + +Index: docs/examples/facette.yaml +--- docs/examples/facette.yaml.orig ++++ docs/examples/facette.yaml +@@ -17,7 +17,7 @@ backend: + + ### SQLite + driver: sqlite +- path: /var/lib/facette/data.db ++ path: ${VARBASE}/facette/data.db + + ### PostgreSQL + #driver: pgsql Index: patches/patch-docs_examples_providers_collectd_json =================================================================== RCS file: patches/patch-docs_examples_providers_collectd_json diff -N patches/patch-docs_examples_providers_collectd_json --- patches/patch-docs_examples_providers_collectd_json 30 Aug 2016 17:34:00 -0000 1.1.1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,12 +0,0 @@ -$OpenBSD: patch-docs_examples_providers_collectd_json,v 1.1.1.1 2016/08/30 17:34:00 landry Exp $ ---- docs/examples/providers/collectd.json.orig Mon May 16 09:55:22 2016 -+++ docs/examples/providers/collectd.json Tue Aug 30 19:23:05 2016 -@@ -1,7 +1,7 @@ - { - "connector": { - "type": "rrd", -- "path": "/var/lib/collectd/rrd", -+ "path": "${LOCALSTATEDIR}/collectd/rrd", - "pattern": "(?P<source>[^/]+)/(?P<metric>.+).rrd" - }, - Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/sysutils/facette/pkg/PLIST,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 PLIST --- pkg/PLIST 30 Aug 2016 17:34:00 -0000 1.1.1.1 +++ pkg/PLIST 25 Dec 2017 09:23:53 -0000 @@ -3,77 +3,53 @@ @newuser _facette:774:774:daemon:Facette Daemon:/var/empty:/sbin/nologin @bin bin/facette @bin bin/facettectl -share/facette/ -share/facette/examples/ +share/examples/facette/ @sample ${SYSCONFDIR}/facette/ -share/facette/examples/facette.apache2 -share/facette/examples/facette.json -@sample ${SYSCONFDIR}/facette/facette.json -share/facette/examples/facette.nginx -share/facette/examples/providers/ -@sample ${SYSCONFDIR}/facette/providers/ -share/facette/examples/providers/collectd.json -@sample ${SYSCONFDIR}/facette/providers/collectd.json -share/facette/examples/providers/graphite.json -share/facette/examples/providers/influxdb.json -share/facette/examples/providers/kairosdb.json -share/facette/static/ -share/facette/static/canvg.js -share/facette/static/facette.js -share/facette/static/favicon.png -share/facette/static/fonts/ -share/facette/static/fonts/Lato-Bold.ttf -share/facette/static/fonts/Lato-Light.ttf -share/facette/static/fonts/Lato-Regular.ttf -share/facette/static/fonts/fontawesome-webfont.eot -share/facette/static/fonts/fontawesome-webfont.svg -share/facette/static/fonts/fontawesome-webfont.ttf -share/facette/static/fonts/fontawesome-webfont.woff -share/facette/static/highcharts.exporting.js -share/facette/static/highcharts.js -share/facette/static/i18next.js -share/facette/static/jquery.datepicker.js -share/facette/static/jquery.js -share/facette/static/loader.gif -share/facette/static/logo-text-light.png -share/facette/static/logo-text.png -share/facette/static/messages.json -share/facette/static/moment.js -share/facette/static/rgbcolor.js -share/facette/static/sprintf.js -share/facette/static/style.css -share/facette/static/style.print.css -share/facette/template/ -share/facette/template/admin/ -share/facette/template/admin/catalog_list.html -share/facette/template/admin/collection_edit.html -share/facette/template/admin/collection_list.html -share/facette/template/admin/graph_edit.html -share/facette/template/admin/graph_edit_linked.html -share/facette/template/admin/graph_list.html -share/facette/template/admin/group_edit.html -share/facette/template/admin/group_list.html -share/facette/template/admin/index.html -share/facette/template/admin/layout.html -share/facette/template/admin/scale_edit.html -share/facette/template/admin/scale_list.html -share/facette/template/admin/unit_edit.html -share/facette/template/admin/unit_list.html -share/facette/template/browse/ -share/facette/template/browse/collection.html -share/facette/template/browse/graph.html -share/facette/template/browse/index.html -share/facette/template/browse/layout.html -share/facette/template/browse/search.html -share/facette/template/common/ -share/facette/template/common/element.html -share/facette/template/common/graph.html -share/facette/template/error.html -share/facette/template/layout.html -share/facette/template/opensearch.xml -share/facette/template/show/ -share/facette/template/show/graph.html -share/facette/template/show/layout.html +share/examples/facette/facette.yaml +@sample ${SYSCONFDIR}/facette/facette.yaml +share/facette/ +share/facette/assets/ +share/facette/assets/css/ +share/facette/assets/css/font-awesome-269550530c-4154814466.min.css +share/facette/assets/css/font-awesome-269550530c.min.css +share/facette/assets/css/style-c5fbcc078d-e1d232649f.css +share/facette/assets/css/style-c5fbcc078d.css +share/facette/assets/css/style-print-59792da171-59792da171.css +share/facette/assets/css/style-print-59792da171.css +share/facette/assets/fonts/ +share/facette/assets/fonts/Roboto-Light-7b5fb88f12-7b5fb88f12.ttf +share/facette/assets/fonts/Roboto-Light-7b5fb88f12.ttf +share/facette/assets/fonts/Roboto-Medium-fe13e41707-fe13e41707.ttf +share/facette/assets/fonts/Roboto-Medium-fe13e41707.ttf +share/facette/assets/fonts/Roboto-Regular-ac3f799d5b-ac3f799d5b.ttf +share/facette/assets/fonts/Roboto-Regular-ac3f799d5b.ttf +share/facette/assets/fonts/fontawesome-webfont-674f50d287-674f50d287.eot +share/facette/assets/fonts/fontawesome-webfont-674f50d287.eot +share/facette/assets/fonts/fontawesome-webfont-912ec66d75-912ec66d75.svg +share/facette/assets/fonts/fontawesome-webfont-912ec66d75.svg +share/facette/assets/fonts/fontawesome-webfont-af7ae505a9-af7ae505a9.woff2 +share/facette/assets/fonts/fontawesome-webfont-af7ae505a9.woff2 +share/facette/assets/fonts/fontawesome-webfont-b06871f281-b06871f281.ttf +share/facette/assets/fonts/fontawesome-webfont-b06871f281.ttf +share/facette/assets/fonts/fontawesome-webfont-fee66e712a-fee66e712a.woff +share/facette/assets/fonts/fontawesome-webfont-fee66e712a.woff +share/facette/assets/html/ +share/facette/assets/html/index.html +share/facette/assets/images/ +share/facette/assets/images/favicon-bec05f9734-bec05f9734.png +share/facette/assets/images/favicon-bec05f9734.png +share/facette/assets/images/logo-main-e327a302b8-e327a302b8.png +share/facette/assets/images/logo-main-e327a302b8.png +share/facette/assets/images/logo-nav-f5c7f823c6-f5c7f823c6.png +share/facette/assets/images/logo-nav-f5c7f823c6.png +share/facette/assets/js/ +share/facette/assets/js/facette-d71d72966b-37f2a4f4a2.js +share/facette/assets/js/facette-d71d72966b.js +share/facette/assets/js/locales/ +share/facette/assets/js/locales/en.json +share/facette/assets/js/locales/fr.json +share/facette/assets/js/vendor-b5aa1b00c1-b5aa1b00c1.js +share/facette/assets/js/vendor-b5aa1b00c1.js @owner _facette @group _facette @sample /var/facette/
