Attachment 175078 Details for Bug 212468 – svn diff patch

[patch] svn diff patch

prometheus.diff (text/plain), 7.97 KB, created by jevonearth on 2016-09-22 21:55:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: jevonearth

Created: 2016-09-22 21:55:43 UTC

Size: 7.97 KB

patch

obsolete

>Index: GIDs
>===================================================================
>--- GIDs	(revision 422639)
>+++ GIDs	(working copy)
>@@ -419,7 +419,7 @@
> # free: 475
> # free: 476
> # free: 477
>-# free: 478
>+prometheus:*:478:
> # free: 479
> # free: 480
> # free: 481
>Index: UIDs
>===================================================================
>--- UIDs	(revision 422639)
>+++ UIDs	(working copy)
>@@ -424,7 +424,7 @@
> # free: 475
> # free: 476
> # free: 477
>-# free: 478
>+prometheus:*:478:478::0:0:Prometheus Daemon:/var/tmp/prometheus:/usr/sbin/nologin
> # free: 479
> # free: 480
> # free: 481
>Index: net-mgmt/prometheus/Makefile
>===================================================================
>--- net-mgmt/prometheus/Makefile	(nonexistent)
>+++ net-mgmt/prometheus/Makefile	(working copy)
>@@ -0,0 +1,40 @@
>+# Created by: Jev BjÃ¶rsell <ports@ecadlabs.com>
>+# $FreeBSD$
>+
>+PORTNAME=	prometheus
>+PORTVERSION=	1.1.3
>+DISTVERSIONPREFIX=	v
>+CATEGORIES=	net-mgmt
>+
>+MAINTAINER=	ports@ecadlabs.com
>+COMMENT=	Systems monitoring and alerting toolkit
>+
>+LICENSE=	APACHE20
>+
>+USES=		go gmake
>+USE_GITHUB=	yes
>+
>+GH_PROJECT=	prometheus
>+
>+GO_PKGNAME=	github.com/${GH_ACCOUNT}/${PORTNAME}
>+
>+PLIST_FILES=	bin/prometheus \
>+		bin/promtool \
>+		etc/prometheus.yml
>+
>+USE_RC_SUBR=	prometheus
>+
>+USERS=		prometheus
>+GROUPS=		prometheus
>+
>+STRIP=		# stripping can break go binaries
>+
>+do-build:
>+	(cd ${GO_WRKSRC} ; ${SETENV} ${GO_ENV} PREFIX=${GO_WRKSRC} ${GMAKE} build)
>+
>+do-install:
>+	${INSTALL_PROGRAM} ${WRKSRC}/promtool ${STAGEDIR}${PREFIX}/bin
>+	${INSTALL_PROGRAM} ${WRKSRC}/prometheus ${STAGEDIR}${PREFIX}/bin
>+	${INSTALL_DATA} ${WRKSRC}/documentation/examples/prometheus.yml ${STAGEDIR}${LOCALBASE}/etc
>+
>+.include <bsd.port.mk>
>
>Property changes on: net-mgmt/prometheus/Makefile
>___________________________________________________________________
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:keywords
>## -0,0 +1 ##
>+FreeBSD=%H
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: net-mgmt/prometheus/distinfo
>===================================================================
>--- net-mgmt/prometheus/distinfo	(nonexistent)
>+++ net-mgmt/prometheus/distinfo	(working copy)
>@@ -0,0 +1,3 @@
>+TIMESTAMP = 1474579163
>+SHA256 (prometheus-prometheus-v1.1.3_GH0.tar.gz) = 6a27ddc47c90a50090fc787300fd79ae97e1fa172e0544cc1cc021f8104a64a3
>+SIZE (prometheus-prometheus-v1.1.3_GH0.tar.gz) = 2556454
>
>Property changes on: net-mgmt/prometheus/distinfo
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: net-mgmt/prometheus/files/patch-Makefile
>===================================================================
>--- net-mgmt/prometheus/files/patch-Makefile	(nonexistent)
>+++ net-mgmt/prometheus/files/patch-Makefile	(working copy)
>@@ -0,0 +1,11 @@
>+--- Makefile.orig	2016-09-09 15:46:12 UTC
>++++ Makefile
>+@@ -13,7 +13,7 @@
>+ 
>+ GO           := GO15VENDOREXPERIMENT=1 go
>+ FIRST_GOPATH := $(firstword $(subst :, ,$(GOPATH)))
>+-PROMU        := $(FIRST_GOPATH)/bin/promu
>++PROMU        := $(FIRST_GOPATH)/bin/promu -v
>+ pkgs          = $(shell $(GO) list ./... | grep -v /vendor/)
>+ 
>+ PREFIX                  ?= $(shell pwd)
>
>Property changes on: net-mgmt/prometheus/files/patch-Makefile
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: net-mgmt/prometheus/files/prometheus.in
>===================================================================
>--- net-mgmt/prometheus/files/prometheus.in	(nonexistent)
>+++ net-mgmt/prometheus/files/prometheus.in	(working copy)
>@@ -0,0 +1,65 @@
>+#!/bin/sh
>+
>+# PROVIDE: prometheus
>+# REQUIRE: LOGIN
>+# KEYWORD: shutdown
>+#
>+# Add the following lines to /etc/rc.conf.local or /etc/rc.conf
>+# to enable this service:
>+#
>+# prometheus_enable (bool):     Set to NO by default
>+#                               Set it to YES to enable prometheus
>+# prometheus_user (string):     Set user to run prometheus
>+#                               Default is "prometheus"
>+# prometheus_group (string):    Set group to run prometheus
>+#                               Default is "prometheus"
>+# prometheus_data_dir (string): Set dir to run prometheus in
>+#                               Default is "/var/tmp/prometheus"
>+# prometheus_log_file (string): Set file that prometheus will log to
>+#                               Default is "/var/log/prometheus.log"
>+# prometheus_args (string):     Set additional command line arguments
>+#                               Default is ""
>+
>+. /etc/rc.subr
>+
>+name=prometheus
>+rcvar=prometheus_enable
>+
>+load_rc_config $name
>+
>+: ${prometheus_enable:="NO"}
>+: ${prometheus_user:="prometheus"}
>+: ${prometheus_group:="prometheus"}
>+: ${prometheus_config:="%%PREFIX%%/etc/prometheus.yml"}
>+: ${prometheus_data_dir:="/var/db/prometheus"}
>+: ${prometheus_log_file:="/var/log/prometheus.log"}
>+: ${prometheus_args:=""}
>+
>+pidfile=/var/run/prometheus.pid
>+required_files="${prometheus_config}"
>+command="/usr/sbin/daemon"
>+procname="%%PREFIX%%/bin/prometheus"
>+sig_reload=HUP
>+extra_commands="reload"
>+command_args="-p ${pidfile} /usr/bin/env ${procname} \
>+                -config.file=${prometheus_config} \
>+                -storage.local.path=${prometheus_data_dir} \
>+                ${prometheus_args} > ${prometheus_log_file} 2>&1"
>+
>+start_precmd=prometheus_startprecmd
>+
>+prometheus_startprecmd()
>+{
>+    if [ ! -e ${pidfile} ]; then
>+        install -o ${prometheus_user} -g ${prometheus_group} /dev/null ${pidfile};
>+    fi
>+    if [ ! -f "${prometheus_log_file}" ]; then
>+        install -o ${prometheus_user} -g ${prometheus_group} -m 640 /dev/null ${prometheus_log_file};
>+    fi
>+    if [ ! -d ${prometheus_data_dir} ]; then
>+        install -d -o ${prometheus_user} -g ${prometheus_group} -m 750 ${prometheus_data_dir}
>+    fi
>+}
>+
>+load_rc_config $name
>+run_rc_command "$1"
>
>Property changes on: net-mgmt/prometheus/files/prometheus.in
>___________________________________________________________________
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:executable
>## -0,0 +1 ##
>+*
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: net-mgmt/prometheus/pkg-descr
>===================================================================
>--- net-mgmt/prometheus/pkg-descr	(nonexistent)
>+++ net-mgmt/prometheus/pkg-descr	(working copy)
>@@ -0,0 +1,19 @@
>+Prometheus is a systems and service monitoring system. It collects metrics
>+from configured targets at given intervals, evaluates rule expressions,
>+displays the results, and can trigger alerts if some condition is observed
>+to be true.
>+
>+Prometheus' main distinguishing features as compared to other monitoring
>+systems are:
>+
>+- a multi-dimensional data model (timeseries defined by metric name and
>+  set of key/value dimensions) 
>+- a flexible query language to leverage this dimensionality 
>+- no dependency on distributed storage; single server nodes are autonomous
>+- timeseries collection happens via a pull model over HTTP
>+- pushing timeseries is supported via an intermediary gateway
>+- targets are discovered via service discovery or static configuration
>+- multiple modes of graphing and dashboarding support
>+- support for hierarchical and horizontal federation
>+
>+WWW: https://prometheus.io/
>
>Property changes on: net-mgmt/prometheus/pkg-descr
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 212468: 174497 | 174498 | 174499 | 175078 | 175101 | 175767