From nobody Fri Feb 23 22:56:10 2024 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ThQNV4SGhz5BhHC; Fri, 23 Feb 2024 22:56:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ThQNV3v4lz4Gkw; Fri, 23 Feb 2024 22:56:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708728970; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CqSModOuPBbiAKEGiTBPMl157cHXnenvv8/LX3TGo5U=; b=UALmC/x4FedyOjSsFEV0B8ruV1HhzbNnM/HxeDdnue0AuTUniuoG1/038u+FTgbll+EfBh uF21K/jJUYb0HYoVp3FjxpLU0yRFKjoEU80sqn+KI8HpEibXw8+c48PB2eE7ffpamx9sl3 xmTQl2EpJeo3gPjQ5Ea+iMFPCFcGDPi/BjHPWdgIcdTsG8iHIXZVgtV7e44T1tVzenRH39 RlKKrd31vOetdN4TunIxzbwV4exw81qKaYVGeXwFVbO9NhuDejDQPPWuoRY3xxcbzB3m56 WaOV12Rsr9voFIggXtJ3ILnXVLSpeVG6vj1WUQvo2SDiqweuwwMiMp9/8zniZw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708728970; a=rsa-sha256; cv=none; b=fr8PslQ1T0KDxi27krLJ2u7/A0pEfYF+ZfDcr9LcLUvRwR+9Swu5XGPCkPvZxtwLctzlOJ 2EL8HrBd7u0nRmnR4aXkgOqRJRs5frhOKmOIfL8PW/OPOnxnwYjadWA1QjdATNtnIIxExH iB77JDKjU2fAOdFgl+JfM5zXmXfpVgLFs9fzJy3gcjwL1g41ZW9bERziu0u0dmUqUL5Mwl sBBXJK2tnWzUIdY6XUDGyOmtOvny7BXe657j4NAvOYC0PHwXLhfHK+0e+dMW6Fy8i4o5s2 UrZjidkOG1YFegUR1QrIx+dieP52pP5m4YpBKDO5kWvFc5YlBYbq8ov6Y1f0ug== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708728970; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CqSModOuPBbiAKEGiTBPMl157cHXnenvv8/LX3TGo5U=; b=TfPoAOTgH/DF7DXt1l9sfRPsnZ5pqvUwlMHGwHGgnPsVqQ47g8Jgu6/NpPD13+x5VTc/rt ZuxJEy1PFuG9teoqfbs2FdY6SqewoQKuLbowC54yvv7fvYUZsUYUDUHPXDp2BBAy3RK9dV 1QxQhYxcZOU1Rlh7PkaJRe47LV/KnK+ERb09npjdtyPC+kgA+vawoqk1q3XrjVrHc/5vhN H5VE/FiP02a2SRCyo+rHtNrIPQGABi3yBmBLog6nVbxs1BkPbfJTJGqEXdCqH+70JTnlD7 TcPLu92+U+0lXhKZ7yOESb973eADm/85nf0ReXaBZ/5ezGudmPpLpMBMDBU/rw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ThQNV2xhkzbLC; Fri, 23 Feb 2024 22:56:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41NMuA6q027960; Fri, 23 Feb 2024 22:56:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41NMuANq027957; Fri, 23 Feb 2024 22:56:10 GMT (envelope-from git) Date: Fri, 23 Feb 2024 22:56:10 GMT Message-Id: <202402232256.41NMuANq027957@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Li-Wen Hsu Subject: git: 75d2f666fd4e - main - net-mgmt/prometheus2: Update to 2.49.1 and enable Prometheus Agent mode List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: lwhsu X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 75d2f666fd4e7761d001eaeb67d0507ce789ff7c Auto-Submitted: auto-generated The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/ports/commit/?id=75d2f666fd4e7761d001eaeb67d0507ce789ff7c commit 75d2f666fd4e7761d001eaeb67d0507ce789ff7c Author: David O'Rourke AuthorDate: 2024-02-23 22:53:52 +0000 Commit: Li-Wen Hsu CommitDate: 2024-02-23 22:56:04 +0000 net-mgmt/prometheus2: Update to 2.49.1 and enable Prometheus Agent mode Changelog between these versions is available at https://github.com/prometheus/prometheus/blob/main/CHANGELOG.md and there are no breaking changes noted between 2.47.1 and 2.49.1. PR: 277131, 277074 --- net-mgmt/prometheus2/Makefile | 3 +-- net-mgmt/prometheus2/distinfo | 14 +++++++------- net-mgmt/prometheus2/files/prometheus.in | 12 +++++++++++- 3 files changed, 19 insertions(+), 10 deletions(-) diff --git a/net-mgmt/prometheus2/Makefile b/net-mgmt/prometheus2/Makefile index e6300c5073b5..4eebe46882f1 100644 --- a/net-mgmt/prometheus2/Makefile +++ b/net-mgmt/prometheus2/Makefile @@ -1,7 +1,6 @@ PORTNAME= prometheus DISTVERSIONPREFIX= v -DISTVERSION= 2.47.1 -PORTREVISION= 2 +DISTVERSION= 2.49.1 CATEGORIES= net-mgmt MASTER_SITES= https://raw.githubusercontent.com/${GH_ACCOUNT}/${GH_PROJECT}/${DISTVERSIONFULL}/:gomod \ https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/releases/download/${DISTVERSIONFULL}/:ui diff --git a/net-mgmt/prometheus2/distinfo b/net-mgmt/prometheus2/distinfo index e2aa7cb3bf90..f3f6a1d8d818 100644 --- a/net-mgmt/prometheus2/distinfo +++ b/net-mgmt/prometheus2/distinfo @@ -1,7 +1,7 @@ -TIMESTAMP = 1696674105 -SHA256 (go/net-mgmt_prometheus2/prometheus-prometheus-v2.47.1_GH0/go.mod) = 7ecfafcca3a934253beb3b928905606dcda5a3bf9385271208b790fe2246f3d7 -SIZE (go/net-mgmt_prometheus2/prometheus-prometheus-v2.47.1_GH0/go.mod) = 9657 -SHA256 (go/net-mgmt_prometheus2/prometheus-prometheus-v2.47.1_GH0/prometheus-web-ui-2.47.1.tar.gz) = 360570c4a85a83f69c139b1d3f7f75d02b8659559f9934a75d24b3b448cba1bb -SIZE (go/net-mgmt_prometheus2/prometheus-prometheus-v2.47.1_GH0/prometheus-web-ui-2.47.1.tar.gz) = 2420839 -SHA256 (go/net-mgmt_prometheus2/prometheus-prometheus-v2.47.1_GH0/prometheus-prometheus-v2.47.1_GH0.tar.gz) = 2fbbdd907453d7448114e55d6074dbdfb046410ee21e03b937ab51287c4384fa -SIZE (go/net-mgmt_prometheus2/prometheus-prometheus-v2.47.1_GH0/prometheus-prometheus-v2.47.1_GH0.tar.gz) = 6335122 +TIMESTAMP = 1708263208 +SHA256 (go/net-mgmt_prometheus2/prometheus-prometheus-v2.49.1_GH0/go.mod) = 6ecc22e2c39aa282a5a4a03f3dab45decaa9232649d10dcdda1dfce513798ce1 +SIZE (go/net-mgmt_prometheus2/prometheus-prometheus-v2.49.1_GH0/go.mod) = 9568 +SHA256 (go/net-mgmt_prometheus2/prometheus-prometheus-v2.49.1_GH0/prometheus-web-ui-2.49.1.tar.gz) = 707333bbbfd6aae46f6c252502ce14e8facb3f83c08a07583b235bbf13687880 +SIZE (go/net-mgmt_prometheus2/prometheus-prometheus-v2.49.1_GH0/prometheus-web-ui-2.49.1.tar.gz) = 2419051 +SHA256 (go/net-mgmt_prometheus2/prometheus-prometheus-v2.49.1_GH0/prometheus-prometheus-v2.49.1_GH0.tar.gz) = 985d7f45ed3d16e23a30eae490c17911518fae96cba0245d493eb07097a10b3b +SIZE (go/net-mgmt_prometheus2/prometheus-prometheus-v2.49.1_GH0/prometheus-prometheus-v2.49.1_GH0.tar.gz) = 6091825 diff --git a/net-mgmt/prometheus2/files/prometheus.in b/net-mgmt/prometheus2/files/prometheus.in index 7171ec94472b..a89342d038e7 100644 --- a/net-mgmt/prometheus2/files/prometheus.in +++ b/net-mgmt/prometheus2/files/prometheus.in @@ -34,6 +34,9 @@ # prometheus_syslog_output_facility (string) # Set syslog facility if syslog enabled # Default is "daemon" +# prometheus_agent_mode (bool) +# Set to "YES" to enable Prometheus Agent Mode +# Default is "NO" # prometheus_consoles (string) # Set dir that contains Prometheus consoles # Default is "%%PROMETHEUS_CONSOLES_DIR%%" @@ -69,6 +72,7 @@ load_rc_config $name : ${prometheus_config:="%%PREFIX%%/etc/prometheus.yml"} : ${prometheus_pidfile:="/var/run/prometheus.pid"} : ${prometheus_syslog_output_enable:="YES"} +: ${prometheus_agent_mode:="NO"} : ${prometheus_consoles_dir:="%%PROMETHEUS_CONSOLES_DIR%%"} : ${prometheus_console_libraries_dir:="%%PROMETHEUS_CONSOLE_LIBRARIES_DIR%%"} : ${prometheus_data_dir:="%%PROMETHEUS_DB_DIR%%"} @@ -89,6 +93,12 @@ if checkyesno prometheus_syslog_output_enable; then fi fi +if checkyesno prometheus_agent_mode; then + prometheus_storage_flags="--enable-feature=agent --storage.agent.path=${prometheus_data_dir}" +else + prometheus_storage_flags="--storage.tsdb.path=${prometheus_data_dir}" +fi + pidfile="${prometheus_pidfile}" required_files="${prometheus_config}" @@ -99,9 +109,9 @@ command_args="-f ${prometheus_syslog_output_flags} -p ${pidfile} -t ${name} \ --config.file=${prometheus_config} \ --web.console.templates=${prometheus_consoles_dir} \ --web.console.libraries=${prometheus_console_libraries_dir} \ - --storage.tsdb.path=${prometheus_data_dir} \ --log.level=${prometheus_loglevel} \ --log.format=${prometheus_logformat} \ + ${prometheus_storage_flags} \ ${prometheus_args}" start_precmd="prometheus_start_precmd"