summaryrefslogtreecommitdiffstats
path: root/system/graphite-web/patches
diff options
context:
space:
mode:
Diffstat (limited to 'system/graphite-web/patches')
-rw-r--r--system/graphite-web/patches/graphite.wsgi.example.diff10
-rw-r--r--system/graphite-web/patches/local_settings.patch85
-rw-r--r--system/graphite-web/patches/remove_internal_logrotate.patch45
-rw-r--r--system/graphite-web/patches/settings_debian.patch25
-rw-r--r--system/graphite-web/patches/setup.cfg.diff19
-rw-r--r--system/graphite-web/patches/setup.py.diff14
6 files changed, 0 insertions, 198 deletions
diff --git a/system/graphite-web/patches/graphite.wsgi.example.diff b/system/graphite-web/patches/graphite.wsgi.example.diff
deleted file mode 100644
index 2584cb7e7c..0000000000
--- a/system/graphite-web/patches/graphite.wsgi.example.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- graphite-web-0.9.15/conf/graphite.wsgi.example.orig 2015-11-27 19:37:16.000000000 +0100
-+++ graphite-web-0.9.15/conf/graphite.wsgi.example 2015-12-03 23:59:30.205576427 +0100
-@@ -1,6 +1,6 @@
- import os
- import sys
--sys.path.append('/opt/graphite/webapp')
-+sys.path.append('/usr/share/graphite-web/static')
-
- try:
- from importlib import import_module
diff --git a/system/graphite-web/patches/local_settings.patch b/system/graphite-web/patches/local_settings.patch
deleted file mode 100644
index f5f647f5bf..0000000000
--- a/system/graphite-web/patches/local_settings.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-Description: Other defaults for Debian
-Author: Jonas Genannt <jonas.genannt@capi2name.de>
-Forwarded: not-needed
-
-diff --git a/webapp/graphite/local_settings.py.example b/webapp/graphite/local_settings.py.example
-index 73a0c57..c40b1e0 100644
---- a/webapp/graphite/local_settings.py.example
-+++ b/webapp/graphite/local_settings.py.example
-@@ -26,9 +26,10 @@
- #DOCUMENTATION_URL = "http://graphite.readthedocs.org/"
-
- # Logging
--#LOG_RENDERING_PERFORMANCE = True
--#LOG_CACHE_PERFORMANCE = True
--#LOG_METRIC_ACCESS = True
-+# True see: https://answers.launchpad.net/graphite/+question/159731
-+LOG_RENDERING_PERFORMANCE = True
-+LOG_CACHE_PERFORMANCE = True
-+LOG_METRIC_ACCESS = True
-
- # Enable full debug page display on exceptions (Internal Server Error pages)
- #DEBUG = True
-@@ -54,14 +55,14 @@
- #####################################
- # Change only GRAPHITE_ROOT if your install is merely shifted from /opt/graphite
- # to somewhere else
--#GRAPHITE_ROOT = '/opt/graphite'
-+GRAPHITE_ROOT = '/usr/share/graphite-web'
-
- # Most installs done outside of a separate tree such as /opt/graphite will only
- # need to change these three settings. Note that the default settings for each
- # of these is relative to GRAPHITE_ROOT
--#CONF_DIR = '/opt/graphite/conf'
--#STORAGE_DIR = '/opt/graphite/storage'
--#CONTENT_DIR = '/opt/graphite/webapp/content'
-+CONF_DIR = '/etc/graphite'
-+STORAGE_DIR = '/var/lib/graphite/whisper'
-+CONTENT_DIR = '/usr/share/graphite-web/static'
-
- # To further or fully customize the paths, modify the following. Note that the
- # default settings for each of these are relative to CONF_DIR and STORAGE_DIR
-@@ -72,11 +73,11 @@
-
- ## Data directories
- # NOTE: If any directory is unreadable in DATA_DIRS it will break metric browsing
--#WHISPER_DIR = '/opt/graphite/storage/whisper'
-+WHISPER_DIR = '/var/lib/graphite/whisper'
- #RRD_DIR = '/opt/graphite/storage/rrd'
- #DATA_DIRS = [WHISPER_DIR, RRD_DIR] # Default: set from the above variables
--#LOG_DIR = '/opt/graphite/storage/log/webapp'
--#INDEX_FILE = '/opt/graphite/storage/index' # Search index file
-+LOG_DIR = '/var/log/graphite'
-+INDEX_FILE = '/var/lib/graphite/search_index' # Search index file
-
-
- #####################################
-@@ -147,17 +148,17 @@
- # The default is 'django.db.backends.sqlite3' with file 'graphite.db'
- # located in STORAGE_DIR
- #
--#DATABASES = {
--# 'default': {
--# 'NAME': '/opt/graphite/storage/graphite.db',
--# 'ENGINE': 'django.db.backends.sqlite3',
--# 'USER': '',
--# 'PASSWORD': '',
--# 'HOST': '',
--# 'PORT': ''
--# }
--#}
--#
-+DATABASES = {
-+ 'default': {
-+ 'NAME': '/var/lib/graphite/graphite.db',
-+ 'ENGINE': 'django.db.backends.sqlite3',
-+ 'USER': '',
-+ 'PASSWORD': '',
-+ 'HOST': '',
-+ 'PORT': ''
-+ }
-+}
-+
-
-
- #########################
diff --git a/system/graphite-web/patches/remove_internal_logrotate.patch b/system/graphite-web/patches/remove_internal_logrotate.patch
deleted file mode 100644
index a78c56f11e..0000000000
--- a/system/graphite-web/patches/remove_internal_logrotate.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-Description: disable internal logroate
-Author: Jonas Genannt <jonas.genannt@capi2name.de>
-Forwarded: not-needed
-
-diff --git a/webapp/graphite/logger.py b/webapp/graphite/logger.py
-index afa43f4..44456ac 100644
---- a/webapp/graphite/logger.py
-+++ b/webapp/graphite/logger.py
-@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
- limitations under the License."""
-
- import os, logging
--from logging.handlers import TimedRotatingFileHandler as Rotater
-+from logging import FileHandler as LogFileHandler
- from django.conf import settings
-
- logging.addLevelName(30,"rendering")
-@@ -37,22 +37,22 @@ class GraphiteLogger:
- self.metricAccessLogger = logging.getLogger("metric_access")
- #Setup formatter & handlers
- self.formatter = logging.Formatter("%(asctime)s :: %(message)s","%a %b %d %H:%M:%S %Y")
-- self.infoHandler = Rotater(self.infoLogFile,when="midnight",backupCount=1)
-+ self.infoHandler = LogFileHandler(self.infoLogFile)
- self.infoHandler.setFormatter(self.formatter)
- self.infoLogger.addHandler(self.infoHandler)
-- self.exceptionHandler = Rotater(self.exceptionLogFile,when="midnight",backupCount=1)
-+ self.exceptionHandler = LogFileHandler(self.exceptionLogFile)
- self.exceptionHandler.setFormatter(self.formatter)
- self.exceptionLogger.addHandler(self.exceptionHandler)
- if settings.LOG_CACHE_PERFORMANCE:
-- self.cacheHandler = Rotater(self.cacheLogFile,when="midnight",backupCount=1)
-+ self.cacheHandler = LogFileHandler(self.cacheLogFile)
- self.cacheHandler.setFormatter(self.formatter)
- self.cacheLogger.addHandler(self.cacheHandler)
- if settings.LOG_RENDERING_PERFORMANCE:
-- self.renderingHandler = Rotater(self.renderingLogFile,when="midnight",backupCount=1)
-+ self.renderingHandler = LogFileHandler(self.renderingLogFile)
- self.renderingHandler.setFormatter(self.formatter)
- self.renderingLogger.addHandler(self.renderingHandler)
- if settings.LOG_METRIC_ACCESS:
-- self.metricAccessHandler = Rotater(self.metricAccessLogFile,when="midnight",backupCount=10)
-+ self.metricAccessHandler = LogFileHandler(self.metricAccessLogFile)
- self.metricAccessHandler.setFormatter(self.formatter)
- self.metricAccessLogger.addHandler(self.metricAccessHandler)
-
diff --git a/system/graphite-web/patches/settings_debian.patch b/system/graphite-web/patches/settings_debian.patch
deleted file mode 100644
index ab66647263..0000000000
--- a/system/graphite-web/patches/settings_debian.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Description: Add etc/graphite to sys.path to load config from /etc/graphite
-Author: Jonas Genannt <jonas.genannt@capi2name.de>
-Forwarded: not-needed
-
---- a/webapp/graphite/settings.py
-+++ b/webapp/graphite/settings.py
-@@ -20,6 +20,9 @@
- from os.path import abspath, dirname, join
- from warnings import warn
-
-+# Debian add etc/graphite into path
-+sys.path.append('/etc/graphite')
-+
- try:
- import rrdtool
- except ImportError:
-@@ -128,7 +131,7 @@
-
- ## Load our local_settings
- try:
-- from graphite.local_settings import *
-+ from local_settings import *
- except ImportError:
- print >> sys.stderr, "Could not import graphite.local_settings, using defaults!"
-
diff --git a/system/graphite-web/patches/setup.cfg.diff b/system/graphite-web/patches/setup.cfg.diff
deleted file mode 100644
index cf244799f1..0000000000
--- a/system/graphite-web/patches/setup.cfg.diff
+++ /dev/null
@@ -1,19 +0,0 @@
---- graphite-web-0.9.15/setup.cfg.orig 2015-11-27 19:37:16.000000000 +0100
-+++ graphite-web-0.9.15/setup.cfg 2015-12-04 00:24:12.045817187 +0100
-@@ -1,16 +0,0 @@
--[bdist_rpm]
--requires = Django => 1.1.4
-- django-tagging
-- carbon
-- whisper
-- mod_wsgi
-- pycairo
-- pycairo-devel
-- python-simplejson
-- python-sqlite2
-- python-hashlib
--
--post-install = distro/redhat/misc/postinstall
--
--provides = graphite
--obsoletes = graphite <= 0.9.9
diff --git a/system/graphite-web/patches/setup.py.diff b/system/graphite-web/patches/setup.py.diff
deleted file mode 100644
index 64c9540e85..0000000000
--- a/system/graphite-web/patches/setup.py.diff
+++ /dev/null
@@ -1,14 +0,0 @@
---- graphite-web-0.9.15/setup.py.orig 2015-11-27 19:37:16.000000000 +0100
-+++ graphite-web-0.9.15/setup.py 2015-12-04 02:50:48.311066851 +0100
-@@ -85,9 +85,8 @@
- 'graphite.thirdparty.pytz',
- ],
- package_data={'graphite' :
-- ['templates/*', 'local_settings.py.example']},
-- scripts=glob('bin/*'),
-- data_files=webapp_content.items() + storage_dirs + conf_files + examples,
-+ ['templates/*']},
-+ data_files=webapp_content.items() + conf_files,
- **setup_kwargs
- )
- finally:
generated by cgit v1.2.3 (git 2.32.0) at 2024-06-09 11:24:06 +0200