From a0bdf69245dcfa1d0f7c0b794a15da42e5cbc4ad Mon Sep 17 00:00:00 2001
From: Tobias Klausmann <klausman@gentoo.org>
Date: Thu, 1 Dec 2016 18:02:04 +0100
Subject: Revert "www-apps/grafana-bin: Add info about higher FD ulimit for
 4.x"

This reverts commit 620deff506d5d7ae1260fb2fa3f5e6188ad50af6.

Grafana 4.0.0 has a massive FD leak problem (needing a restart every ten
minutes, depending on the amount of dashboard users and metrics).

Upstream is aware:

https://github.com/grafana/grafana/issues/6759

Still, we'll roll back 4.0.0 to beta2 until 4.0.1 is out.
---
 www-apps/grafana-bin/files/grafana.confd         |  5 ---
 www-apps/grafana-bin/grafana-bin-4.0.0-r1.ebuild | 57 ------------------------
 www-apps/grafana-bin/grafana-bin-4.0.0.ebuild    | 51 +++++++++++++++++++++
 3 files changed, 51 insertions(+), 62 deletions(-)
 delete mode 100644 www-apps/grafana-bin/grafana-bin-4.0.0-r1.ebuild
 create mode 100644 www-apps/grafana-bin/grafana-bin-4.0.0.ebuild

(limited to 'www-apps/grafana-bin')

diff --git a/www-apps/grafana-bin/files/grafana.confd b/www-apps/grafana-bin/files/grafana.confd
index 0ad311de1de3..207ef765f653 100644
--- a/www-apps/grafana-bin/files/grafana.confd
+++ b/www-apps/grafana-bin/files/grafana.confd
@@ -5,8 +5,3 @@ GRAFANA_USER=grafana
 
 # The group to run your application as.
 GRAFANA_GROUP=grafana
-
-# Starting with 4.0, grafana uses a lot of file descriptors.
-# If you run into the default limit of 1024, uncomment this line and if needed,
-# bump its value.
-#rc_ulimit="-n 10000"
diff --git a/www-apps/grafana-bin/grafana-bin-4.0.0-r1.ebuild b/www-apps/grafana-bin/grafana-bin-4.0.0-r1.ebuild
deleted file mode 100644
index 95285d178697..000000000000
--- a/www-apps/grafana-bin/grafana-bin-4.0.0-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit user
-MY_PN=${PN/-bin/}
-MY_PV="4.0.0-1480439068"
-S=${WORKDIR}/${MY_PN}-${MY_PV}
-
-DESCRIPTION="Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB & OpenTSDB"
-HOMEPAGE="http://grafana.org"
-SRC_URI="https://grafanarel.s3.amazonaws.com/builds/${MY_PN}-${MY_PV}.linux-x64.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	>=dev-lang/go-1.5
-	net-libs/nodejs
-"
-
-pkg_setup() {
-	enewgroup grafana
-	enewuser grafana -1 -1 /usr/share/grafana grafana
-}
-
-src_install() {
-	keepdir /etc/grafana
-	insinto /etc/grafana
-	newins "${S}"/conf/sample.ini grafana.ini
-	rm "${S}"/conf/sample.ini
-
-	# Frontend assets
-	insinto /usr/share/${MY_PN}
-	doins -r public conf vendor
-
-	dobin bin/grafana-cli
-	dobin bin/grafana-server
-
-	newconfd "${FILESDIR}"/grafana.confd grafana
-	newinitd "${FILESDIR}"/grafana.initd.2 grafana
-
-	keepdir /var/{lib,log}/grafana
-	fowners grafana:grafana /var/{lib,log}/grafana
-	fperms 0750 /var/{lib,log}/grafana
-}
-
-post_install() {
-	einfo "Starting with version 4.0, Grafana is using a lot more file"
-	einfo "descriptors. You can bump the limit (by default 1024) by"
-	einfo "uncommenting the relevant line in /etc/conf.d/grafana."
-}
diff --git a/www-apps/grafana-bin/grafana-bin-4.0.0.ebuild b/www-apps/grafana-bin/grafana-bin-4.0.0.ebuild
new file mode 100644
index 000000000000..b46087709f6f
--- /dev/null
+++ b/www-apps/grafana-bin/grafana-bin-4.0.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit user
+MY_PN=${PN/-bin/}
+MY_PV="4.0.0-1480439068"
+S=${WORKDIR}/${MY_PN}-${MY_PV}
+
+DESCRIPTION="Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB & OpenTSDB"
+HOMEPAGE="http://grafana.org"
+SRC_URI="https://grafanarel.s3.amazonaws.com/builds/${MY_PN}-${MY_PV}.linux-x64.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}
+	>=dev-lang/go-1.5
+	net-libs/nodejs
+"
+
+pkg_setup() {
+	enewgroup grafana
+	enewuser grafana -1 -1 /usr/share/grafana grafana
+}
+
+src_install() {
+	keepdir /etc/grafana
+	insinto /etc/grafana
+	newins "${S}"/conf/sample.ini grafana.ini
+	rm "${S}"/conf/sample.ini
+
+	# Frontend assets
+	insinto /usr/share/${MY_PN}
+	doins -r public conf vendor
+
+	dobin bin/grafana-cli
+	dobin bin/grafana-server
+
+	newconfd "${FILESDIR}"/grafana.confd grafana
+	newinitd "${FILESDIR}"/grafana.initd.2 grafana
+
+	keepdir /var/{lib,log}/grafana
+	fowners grafana:grafana /var/{lib,log}/grafana
+	fperms 0750 /var/{lib,log}/grafana
+}
-- 
cgit v1.2.3-65-gdbad