Merge branch 'develop' of https://github.com/nicolargo/glances into d…

…evelop

.gitignore

@@ -48,5 +48,5 @@ _build
 node_modules/
 bower_components/
 
-# visual stdio code 
-.vscode/
+# visual stdio code
+.vscode/

conf/glances.conf

@@ -365,6 +365,9 @@ keyspace=glances
 replication_factor=2
 # If not define, table name is set to host key
 table=localhost
+# If not define, username and password will not be used
+#username=cassandra
+#password=password
 
 [opentsdb]
 # Configuration for the --export opentsdb option

glances/exports/glances_cassandra.py

@@ -27,6 +27,7 @@
 from glances.exports.glances_export import GlancesExport
 from glances.compat import iteritems
 
+from cassandra.auth import PlainTextAuthProvider
 from cassandra.cluster import Cluster
 from cassandra.util import uuid_from_time
 from cassandra import InvalidRequest
@@ -47,29 +48,38 @@ def __init__(self, config=None, args=None):
         self.protocol_version = 3
         self.replication_factor = 2
         self.table = None
+        self.username = None
+        self.password = None
 
         # Load the Cassandra configuration file section
         self.export_enable = self.load_conf('cassandra',
                                             mandatories=['host', 'port', 'keyspace'],
                                             options=['protocol_version',
                                                      'replication_factor',
-                                                     'table'])
+                                                     'table',
+                                                     'username',
+                                                     'password'])
         if not self.export_enable:
             sys.exit(2)
 
         # Init the Cassandra client
         self.cluster, self.session = self.init()
 
     def init(self):
-        """Init the connection to the InfluxDB server."""
+        """Init the connection to the Cassandra server."""
         if not self.export_enable:
             return None
 
+        # if username and/or password are not set the connection will try to connect with no auth
+        auth_provider = PlainTextAuthProvider(
+            username=self.username, password=self.password)
+
         # Cluster
         try:
             cluster = Cluster([self.host],
                               port=int(self.port),
-                              protocol_version=int(self.protocol_version))
+                              protocol_version=int(self.protocol_version),
+                              auth_provider=auth_provider)
             session = cluster.connect()
         except Exception as e:
             logger.critical("Cannot connect to Cassandra cluster '%s:%s' (%s)" % (self.host, self.port, e))

glances/outputs/glances_curses_browser.py

@@ -62,6 +62,8 @@ def __init__(self, args=None):
         self._page_max_lines = 0
 
         self.is_end = False
+        self._revesed_sorting = False
+        self._stats_list = None
 
     @property
     def active_server(self):
@@ -90,6 +92,33 @@ def get_pagelines(self, stats):
             page_lines = self._page_max_lines
         return page_lines
 
+    def _get_status_count(self, stats):
+        counts = {}
+        for item in stats:
+            color = item['status']
+            counts[color] = counts.get(color, 0) + 1
+
+        result = ''
+        for key in counts.keys():
+            result += key + ': ' + str(counts[key]) + ' '
+
+        return result
+
+    def _get_stats(self, stats):
+        stats_list = None
+        if self._stats_list is not None:
+            stats_list = self._stats_list
+            stats_list.sort(reverse = self._revesed_sorting, 
+                            key = lambda x: { 'UNKNOWN' : 0,
+                                              'OFFLINE' : 1,
+                                              'PROTECTED' : 2,
+                                              'SNMP' : 3,
+                                              'ONLINE': 4 }.get(x['status'], 99))
+        else:
+            stats_list = stats
+
+        return stats_list
+
     def cursor_up(self, stats):
         """Set the cursor to position N-1 in the list."""
         if 0 <= self.cursor_position - 1:
@@ -133,7 +162,7 @@ def cursor_pagedown(self, stats):
     def __catch_key(self, stats):
         # Catch the browser pressed key
         self.pressedkey = self.get_key(self.term_window)
-
+        refresh = False
         if self.pressedkey != -1:
             logger.debug("Key pressed. Code=%s" % self.pressedkey)
 
@@ -164,6 +193,22 @@ def __catch_key(self, stats):
             # 'Page Down' > Next page in the server list
             self.cursor_pagedown(stats)
             logger.debug("PageDown: Server {}/{} pages".format(self._current_page + 1, self._page_max))
+        elif self.pressedkey == ord('1'):
+            self._stats_list = None
+            refresh = True
+        elif self.pressedkey == ord('2'):
+            self._revesed_sorting = False            
+            self._stats_list = stats.copy()
+            refresh = True
+        elif self.pressedkey == ord('3'):
+            self._revesed_sorting = True
+            self._stats_list = stats.copy()
+            refresh = True
+
+        if refresh:
+            self._current_page = 0
+            self.cursor_position = 0
+            self.flush(stats)
 
         # Return the key code
         return self.pressedkey
@@ -248,12 +293,21 @@ def display(self, stats, cs_status=None):
                                      msg,
                                      screen_x - x,
                                      self.colors_list['TITLE'])
-        if stats_len > stats_max and screen_y > 2:
-            msg = '{} servers displayed.({}/{})'.format(self.get_pagelines(stats), self._current_page + 1, self._page_max)
+
+            msg = '{}'.format(self._get_status_count(stats))
             self.term_window.addnstr(y + 1, x,
                                      msg,
                                      screen_x - x)
 
+        if stats_len > stats_max and screen_y > 2:
+            msg = '{} servers displayed.({}/{}) {}'.format(self.get_pagelines(stats),
+                                                            self._current_page + 1, 
+                                                            self._page_max, 
+                                                            self._get_status_count(stats))
+            self.term_window.addnstr(y + 1, x,
+                                     msg,
+                                     screen_x - x)
+
         if stats_len == 0:
             return False
 
@@ -292,9 +346,10 @@ def display(self, stats, cs_status=None):
             # Set the cursor position to the latest item
             self.cursor = len(stats) - 1
 
+        stats_list = self._get_stats(stats)
         start_line = self._page_max_lines * self._current_page 
-        end_line = start_line + self.get_pagelines(stats)
-        current_page = stats[start_line:end_line]
+        end_line = start_line + self.get_pagelines(stats_list)
+        current_page = stats_list[start_line:end_line]
 
         # Display table
         line = 0