From e7a41a94f02c504f76d02a2d4faa908238b6640a Mon Sep 17 00:00:00 2001 From: earthgecko Date: Fri, 29 Jul 2016 16:25:36 +0100 Subject: [PATCH] v1.0.2-beta-crucible - crucible - Using Eddified's elegent hack to overwrite Dygraph's DateAccessorsUTC to return values according to the currently selected timezone as per: http://stackoverflow.com/a/24196184 to fix Issue #14 - Panorama dygraph not aligning correctly (interal ref bug1524) https://github.com/earthgecko/skyline/issues/14 - Add the WEBAPP timezone related variables to settings.py - Added moment.js/2.14.1 and moment-timezone/0.5.5 to be pulled from cdnjs.cloudflare.com - Added time zone section to Webapp docs - Added rebrow flask.flash messages and confirmation on deleting a Redis key - Fixed type error in a skyline_functions.py except - Bumped up to version 1.0.2 Added: docs/releases/1_0_2.rst Modified: docs/conf.py docs/installation.rst docs/releases.rst docs/webapp.rst docs/whats-new.md skyline/settings.py skyline/skyline_functions.py skyline/skyline_version.py skyline/webapp/static/js/panorama.js skyline/webapp/templates/layout.html skyline/webapp/templates/panorama.html skyline/webapp/templates/rebrow_keys.html skyline/webapp/webapp.py --- docs/_build/html/.buildinfo | 2 +- .../html/_modules/algorithm_exceptions.html | 6 +- docs/_build/html/_modules/analyzer/agent.html | 6 +- .../html/_modules/analyzer/alerters.html | 6 +- .../html/_modules/analyzer/algorithms.html | 6 +- .../html/_modules/analyzer/analyzer.html | 6 +- .../html/_modules/analyzer_dev/agent.html | 6 +- .../html/_modules/analyzer_dev/alerters.html | 6 +- .../_modules/analyzer_dev/algorithms_dev.html | 6 +- .../_modules/analyzer_dev/analyzer_dev.html | 6 +- docs/_build/html/_modules/boundary/agent.html | 6 +- .../html/_modules/boundary/boundary.html | 6 +- .../_modules/boundary/boundary_alerters.html | 6 +- .../boundary/boundary_algorithms.html | 6 +- docs/_build/html/_modules/crucible/agent.html | 6 +- .../html/_modules/crucible/crucible.html | 6 +- .../crucible/crucible_algorithms.html | 6 +- docs/_build/html/_modules/horizon/agent.html | 6 +- docs/_build/html/_modules/horizon/listen.html | 6 +- docs/_build/html/_modules/horizon/roomba.html | 6 +- docs/_build/html/_modules/horizon/worker.html | 6 +- docs/_build/html/_modules/index.html | 6 +- docs/_build/html/_modules/logging.html | 6 +- docs/_build/html/_modules/mirage/agent.html | 6 +- docs/_build/html/_modules/mirage/mirage.html | 6 +- .../html/_modules/mirage/mirage_alerters.html | 6 +- .../_modules/mirage/mirage_algorithms.html | 6 +- .../_build/html/_modules/mirage/negaters.html | 6 +- docs/_build/html/_modules/panorama/agent.html | 6 +- .../html/_modules/panorama/panorama.html | 6 +- .../html/_modules/skyline_functions.html | 8 +- docs/_build/html/_modules/webapp/backend.html | 6 +- docs/_build/html/_modules/webapp/webapp.html | 33 ++- docs/_build/html/_sources/installation.txt | 2 +- docs/_build/html/_sources/releases.txt | 1 + docs/_build/html/_sources/webapp.txt | 16 ++ docs/_build/html/_sources/whats-new.txt | 8 +- docs/_build/html/alert-testing.html | 6 +- docs/_build/html/analyzer-optimizations.html | 6 +- docs/_build/html/analyzer.html | 6 +- docs/_build/html/boundary.html | 6 +- docs/_build/html/building-documentation.html | 6 +- docs/_build/html/crucible.html | 6 +- .../debian-and-vagrant-installation-tips.html | 6 +- docs/_build/html/development/index.html | 6 +- docs/_build/html/development/webapp.html | 6 +- docs/_build/html/genindex.html | 18 +- .../html/getting-data-into-skyline.html | 6 +- docs/_build/html/getting-started.html | 6 +- docs/_build/html/horizon.html | 6 +- docs/_build/html/index.html | 6 +- docs/_build/html/installation.html | 10 +- docs/_build/html/logging.html | 6 +- docs/_build/html/mirage-1.pdf | Bin 21874 -> 21874 bytes docs/_build/html/mirage.html | 6 +- docs/_build/html/modules.html | 6 +- docs/_build/html/monitoring-skyline.html | 6 +- docs/_build/html/objects.inv | Bin 3456 -> 3496 bytes docs/_build/html/overview.html | 6 +- docs/_build/html/panorama.html | 6 +- docs/_build/html/py-modindex.html | 6 +- docs/_build/html/redis-integration.html | 6 +- docs/_build/html/releases.html | 8 +- docs/_build/html/releases/1_0_0.html | 7 +- docs/_build/html/requirements.html | 6 +- docs/_build/html/roadmap.html | 6 +- .../html/running-in-python-virtualenv.html | 6 +- docs/_build/html/search.html | 6 +- docs/_build/html/searchindex.js | 2 +- docs/_build/html/skyline-and-friends.html | 6 +- docs/_build/html/skyline.analyzer.html | 8 +- docs/_build/html/skyline.analyzer_dev.html | 6 +- docs/_build/html/skyline.boundary.html | 6 +- docs/_build/html/skyline.crucible.html | 6 +- docs/_build/html/skyline.horizon.html | 6 +- docs/_build/html/skyline.html | 60 +++++- docs/_build/html/skyline.mirage.html | 6 +- docs/_build/html/skyline.panorama.html | 6 +- docs/_build/html/skyline.webapp.html | 6 +- docs/_build/html/tuning-tips.html | 6 +- docs/_build/html/upgrading.html | 6 +- docs/_build/html/webapp.html | 21 +- docs/_build/html/whats-new.html | 19 +- docs/_build/plot_directive/mirage-1.pdf | Bin 21874 -> 21874 bytes docs/conf.py | 2 +- docs/installation.rst | 2 +- docs/releases.rst | 1 + docs/releases/1_0_2.rst | 22 ++ docs/webapp.rst | 16 ++ docs/whats-new.md | 8 +- skyline/settings.py | 32 +++ skyline/skyline_functions.py | 2 +- skyline/skyline_version.py | 2 +- skyline/webapp/static/js/panorama.js | 204 ++++++++++++++++-- skyline/webapp/templates/layout.html | 18 +- skyline/webapp/templates/panorama.html | 7 + skyline/webapp/templates/rebrow_keys.html | 2 +- skyline/webapp/webapp.py | 27 ++- 98 files changed, 692 insertions(+), 266 deletions(-) create mode 100644 docs/releases/1_0_2.rst diff --git a/docs/_build/html/.buildinfo b/docs/_build/html/.buildinfo index 490fb755..9abfc07a 100644 --- a/docs/_build/html/.buildinfo +++ b/docs/_build/html/.buildinfo @@ -1,4 +1,4 @@ # Sphinx build info version 1 # This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done. -config: c088a2320d4315ed0da6a2d278cb0ce8 +config: 9e521133f19e5e7c7e76af30662f99e2 tags: 645f666f9bcd5a90fca523b33c5a78b7 diff --git a/docs/_build/html/_modules/algorithm_exceptions.html b/docs/_build/html/_modules/algorithm_exceptions.html index 0ac1e42c..2a8cfce3 100644 --- a/docs/_build/html/_modules/algorithm_exceptions.html +++ b/docs/_build/html/_modules/algorithm_exceptions.html @@ -8,7 +8,7 @@ - algorithm_exceptions — Skyline 1.0.1-dev documentation + algorithm_exceptions — Skyline 1.0.2-dev documentation @@ -32,7 +32,7 @@ - + @@ -201,7 +201,7 @@

Source code for algorithm_exceptions

     
@@ -219,7 +219,7 @@ 
All modules for which code is available

     
@@ -1747,6 +1747,10 @@ 
W

   
WEBAPP_AUTH_USER_PASSWORD (in module settings)
   

 
+      
+  
WEBAPP_FIXED_TIMEZONE (in module settings)
+  

+
   
   

       
@@ -1758,6 +1762,10 @@ 
W

   
 
       
+  
WEBAPP_JAVASCRIPT_DEBUG (in module settings)
+  

+
+      
   
WEBAPP_PORT (in module settings)
   

 
@@ -1766,6 +1774,10 @@ 
W

   
 
       
+  
WEBAPP_USER_TIMEZONE (in module settings)
+  

+
+      
   
Worker (class in horizon.worker)
   

 
@@ -1813,7 +1825,7 @@ 
W

     
@@ -277,7 +277,7 @@ 
skyline
         var DOCUMENTATION_OPTIONS = {
             URL_ROOT:'./',
-            VERSION:'1.0.1-dev',
+            VERSION:'1.0.2-dev',
             COLLAPSE_INDEX:false,
             FILE_SUFFIX:'.html',
             HAS_SOURCE:  true
diff --git a/docs/_build/html/monitoring-skyline.html b/docs/_build/html/monitoring-skyline.html
index 46cb1227..c66972ef 100644
--- a/docs/_build/html/monitoring-skyline.html
+++ b/docs/_build/html/monitoring-skyline.html
@@ -8,7 +8,7 @@
   
   
   
-  Monitoring Skyline — Skyline 1.0.1-dev documentation
+  Monitoring Skyline — Skyline 1.0.2-dev documentation
   
 
   
@@ -32,7 +32,7 @@
   
 
   
-    
+    
         
          
 
@@ -240,7 +240,7 @@
     
@@ -197,7 +197,7 @@
     
@@ -111,6 +111,7 @@
 
  • Building documentation
    • 
 
  • Release Notes
    • 
 
  • What’s new
      
+
    • Skyline v1.0.2-beta - the crucible branch
      • 
 
    • Skyline v1.0.1-beta - the crucible branch
      • 
 
    • Skyline v1.0.0-beta - the crucible branch
        
 
      • Conceptual changes
        • 
@@ -180,11 +181,15 @@
             
   
        
 
        What’s new
        
+
        
+
        Skyline v1.0.2-beta - the crucible branch
        
+
        Custom time zone settings for the rendering of Webapp Panorama dygraph graphs
+see Webapp - Time zones
        
+
        
 
        
 
        Skyline v1.0.1-beta - the crucible branch
        
 
        Analyzer alerts with a graph plotted from Redis data, not just the Graphite
-graph see
-Analyzer SMTP alert graphs <../analyzer.html#analyzer-smtp-alert-graphs>__
        
+graph see Analyzer SMTP alert graphs
        
 
        
 
        
 
        Skyline v1.0.0-beta - the crucible branch
        
@@ -296,7 +301,7 @@
         Next 
       
       
-         Previous
+         Previous
       
     
        
   
@@ -327,7 +332,7 @@
     
+
+
+  
+  
+
 	
          
   	
          
   		
        1. Home
          2. 
diff --git a/skyline/webapp/templates/rebrow_keys.html b/skyline/webapp/templates/rebrow_keys.html
index 9287cdb0..8c7eb9ac 100644
--- a/skyline/webapp/templates/rebrow_keys.html
+++ b/skyline/webapp/templates/rebrow_keys.html
@@ -65,7 +65,7 @@ 
          All Keys
          
 	    		{{ loop.index + offset }}
 	    		{{ types[key] }}
 	    		{{ key }}
-	    		
          
+	    		
          
 	    	
 			{% endfor %}
 		
diff --git a/skyline/webapp/webapp.py b/skyline/webapp/webapp.py
index 8b4cb97d..6463c617 100644
--- a/skyline/webapp/webapp.py
+++ b/skyline/webapp/webapp.py
@@ -6,7 +6,7 @@
 import traceback
 from msgpack import Unpacker
 from functools import wraps
-from flask import Flask, request, render_template, redirect, Response, abort
+from flask import Flask, request, render_template, redirect, Response, abort, flash
 from daemon import runner
 from os.path import dirname, abspath, isdir
 from os import path
@@ -23,6 +23,8 @@
 import string
 # flask things for rebrow
 from flask import session, g, url_for, flash, Markup, json
+# For secret_key
+import uuid
 
 from logging.handlers import TimedRotatingFileHandler, MemoryHandler
 
@@ -50,14 +52,30 @@
 
 REDIS_CONN = redis.StrictRedis(unix_socket_path=settings.REDIS_SOCKET_PATH)
 
-ENABLE_WEBAPP_DEBUG = True
+# ENABLE_WEBAPP_DEBUG = True
 
 app = Flask(__name__)
+app.secret_key = str(uuid.uuid5(uuid.NAMESPACE_DNS, settings.GRAPHITE_HOST))
 app.config['PROPAGATE_EXCEPTIONS'] = True
 
 graph_url_string = str(settings.GRAPH_URL)
 PANORAMA_GRAPH_URL = re.sub('\/render\/.*', '', graph_url_string)
 
+# @added 20160727 - Bug #1524: Panorama dygraph not aligning correctly
+# Defaults for momentjs to work if the setttings.py was not updated
+try:
+    WEBAPP_USER_TIMEZONE = settings.WEBAPP_USER_TIMEZONE
+except:
+    WEBAPP_USER_TIMEZONE = True
+try:
+    WEBAPP_FIXED_TIMEZONE = settings.WEBAPP_FIXED_TIMEZONE
+except:
+    WEBAPP_FIXED_TIMEZONE = 'Etc/GMT+0'
+try:
+    WEBAPP_JAVASCRIPT_DEBUG = settings.WEBAPP_JAVASCRIPT_DEBUG
+except:
+    WEBAPP_JAVASCRIPT_DEBUG = False
+
 
 @app.before_request
 def limit_remote_addr():
@@ -185,7 +203,10 @@ def app_settings():
                         'PANORAMA_DBPORT': settings.PANORAMA_DBPORT,
                         'PANORAMA_DBUSER': settings.PANORAMA_DBUSER,
                         'PANORAMA_DBUSERPASS': 'redacted',
-                        'PANORAMA_GRAPH_URL': PANORAMA_GRAPH_URL
+                        'PANORAMA_GRAPH_URL': PANORAMA_GRAPH_URL,
+                        'WEBAPP_USER_TIMEZONE': settings.WEBAPP_USER_TIMEZONE,
+                        'WEBAPP_FIXED_TIMEZONE': settings.WEBAPP_FIXED_TIMEZONE,
+                        'WEBAPP_JAVASCRIPT_DEBUG': settings.WEBAPP_JAVASCRIPT_DEBUG
                         }
     except Exception as e:
         error = "error: " + e