Bug 201682
| Summary: | [NEW PORT] www/grafana2: Dashboard and graph editor for Graphite, InfluxDB & OpenTSDB | ||||||||||||||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| Product: | Ports & Packages | Reporter: | Thomas Bartelmess <thomas> | ||||||||||||||||||||||||||||
| Component: | Individual Port(s) | Assignee: | Kurt Jaeger <pi> | ||||||||||||||||||||||||||||
| Status: | Closed FIXED | ||||||||||||||||||||||||||||||
| Severity: | Affects Some People | CC: | fcharlier, kbowling, koobs, loic.blot, lorne, pi, thomas, xmj | ||||||||||||||||||||||||||||
| Priority: | --- | Keywords: | feature, patch, patch-ready | ||||||||||||||||||||||||||||
| Version: | Latest | Flags: | koobs:
maintainer-feedback+
|
||||||||||||||||||||||||||||
| Hardware: | Any | ||||||||||||||||||||||||||||||
| OS: | Any | ||||||||||||||||||||||||||||||
| URL: | http://grafana.org | ||||||||||||||||||||||||||||||
| Attachments: |
|
||||||||||||||||||||||||||||||
Created attachment 158953 [details]
add grafana user/group
Created attachment 158954 [details]
poudriere log
Created attachment 158957 [details]
shar
Nice work Thomas, thanks for your submission.
PORTREVISION can be removed (since new port)
Directories dont respect hier(7):
GRAFANADATADIR= ${PREFIX}/var/db/grafana/ -> /var/db/${PORTNAME}
GRAFANALOGDIR= ${PREFIX}/var/log/grafana/ -> /var/log/${PORTNAME}
GRAFANAPIDDIR= ${PREFIX}/var/run/grafana/ -> /var/run/${PORTNAME}
Since grafana (1.x) exists, check CONFLICTS, and make sure dirs are unique (not shared)
Turn the following into OPTIONS helpers (See Mk/bsd.options.mk)
.if ${PORT_OPTIONS:MPRECOMPILEDCSSJS}
MASTER_SITES+= http://files.bartelmess.io/public/:static_assets
DISTFILES+= grafana-static-2.0.1.tar.gz:static_assets
.endif
.if ${PORT_OPTIONS:MCOMPILECSSJS}
BUILD_DEPENDS+= npm>=0:${PORTSDIR}/www/npm
.endif
Eg: <OPTION>_FOO= value
Very good job thomas, i fix the points mentionned below Created attachment 163234 [details]
grafana2.shar
grafana2.shar from thomas with fixed paths
Created attachment 163236 [details]
grafana2.shar
Fix a path problem at build
Refixed @Loic, we need updated confirmation that the changes pass QA (portlint, poudriere) And also (since you're not the original author of this issue) we need Thomas to obsolete his original attachments in favour of yours. This should leave one attachment (shar) for the new port + any extras if you would like to attach QA logs. No problem @Kubilay, i only would help :) Thomas, can you upgrade to 2.5, this 2.0.2 version is outdated and has some anoying interface bugs ? Thanks ! (In reply to loic.blot from comment #10) And it's greatly appreciated :) Created attachment 163386 [details]
shar archive
Sorry for being unresponsive here. I've updated it to 2.5.0 and fixed a few things in the makefile.
Created attachment 163387 [details]
poudriere log
Thanks Thomas, USE_RC_SUBR= grafana Might be better as grafana2 Please also set maintainer-approval to + on any attachments you want to approve as maintainer (including those you attach) Created attachment 163407 [details]
shar archive
New shar archive. Using grafana2 as rc name.
Created attachment 163408 [details]
poudriere log
Thanks for the Feedback Kubilay, I've changed the name of the service to grafana2, including the config file. (/usr/local/etc/grafana2.conf) Thanks. Thanks Thomas, im assuming attachment 158953 [details] is still relevant and needs no changes? If so, please add maintainer-approval to that too
(In reply to Kubilay Kocak from comment #18) Yes the user/group are still needed grafana UID & GID conflicts with _rmilter UID GID Created attachment 163418 [details]
add grafana user/group
Now using 904 as UID/GID
Passes poudriere testport, but the shar archive attached on 2015-11-22 04:45 UTC has a bit of a mess within files/ subdir. I'm assuming you want files/grafana2.in and files/grafana2.conf.in. The option to compile JS/CSS on the system the port is being built in is a bit spurious, in that `npm install` fetches things outside of the fetch-stage. This isn't the right way to go about it, a better way would be to download all things during fetch-stage manually, and then compile JS/CSS things that have been downloaded previously. Alternatively, COMPILE_JS_CSS could be removed completely. (In reply to Johannes Jost Meixner from comment #22) I think I'd go for removing the option. Generating the CSS needs quite a few dependencies, with probably is not worth it. So what's needed now to progress this issue? (In reply to Kubilay Kocak from comment #24) I've updated the port and removed the option generate the javascript/css as part of the build process. Created attachment 163583 [details]
Shar archive
Created attachment 163584 [details]
poudriere log
(In reply to Kubilay Kocak from comment #24) Is anything needed from me to progress this? (In reply to Thomas Bartelmess from comment #28) All good at your end Thomas. (In reply to Kubilay Kocak from comment #29) Can this port be included in ports tree now ? :) Testing@work A commit references this bug: Author: pi Date: Fri Dec 11 06:24:56 UTC 2015 New revision: 403502 URL: https://svnweb.freebsd.org/changeset/ports/403502 Log: New port: www/grafana2 Grafana is an open source, feature rich metrics dashboard and graph editor for Graphite, InfluxDB & OpenTSDB. WWW: https://github.com/grafana/grafana PR: 201682 Submitted by: Thomas Bartelmess <thomas@bartelmess.io>, loic.blot@unix-experience.fr Reviewed by: koobs Changes: head/GIDs head/UIDs head/www/Makefile head/www/grafana2/ head/www/grafana2/Makefile head/www/grafana2/distinfo head/www/grafana2/files/ head/www/grafana2/files/grafana2.conf.in head/www/grafana2/files/grafana2.in head/www/grafana2/pkg-descr head/www/grafana2/pkg-plist Committed, thanks for your patience! |
Created attachment 158952 [details] shar There is already a port for Grafana (www/grafana). However since Grafana 2 is very different from an administration perspective (just a bunch HTML/CSS/JS files for Grafana 1 vs an own web server with authentication) I think it makes a sense to keep www/grafana around, and have this new port www/grafana2 as an alternative.