summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTobias Klausmann <klausman@gentoo.org>2016-12-01 18:02:04 +0100
committerTobias Klausmann <klausman@gentoo.org>2016-12-01 18:03:50 +0100
commita0bdf69245dcfa1d0f7c0b794a15da42e5cbc4ad (patch)
treea89cc091aaa55664d64b1ada41722a96eda564c1
parentapp-emulation/virt-manager: drop vte:2.90 dependency, bug #595892 (diff)
downloadgentoo-a0bdf69245dcfa1d0f7c0b794a15da42e5cbc4ad.tar.gz
gentoo-a0bdf69245dcfa1d0f7c0b794a15da42e5cbc4ad.tar.bz2
gentoo-a0bdf69245dcfa1d0f7c0b794a15da42e5cbc4ad.zip
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.
-rw-r--r--www-apps/grafana-bin/files/grafana.confd5
-rw-r--r--www-apps/grafana-bin/grafana-bin-4.0.0.ebuild (renamed from www-apps/grafana-bin/grafana-bin-4.0.0-r1.ebuild)6
2 files changed, 0 insertions, 11 deletions
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.ebuild
index 95285d178697..b46087709f6f 100644
--- a/www-apps/grafana-bin/grafana-bin-4.0.0-r1.ebuild
+++ b/www-apps/grafana-bin/grafana-bin-4.0.0.ebuild
@@ -49,9 +49,3 @@ src_install() {
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."
-}