pimon 0.1.11 → 0.2.0

data/lib/pimon/probe/memory_usage.rb

@@ -1,13 +1,18 @@
-require 'pimon/probe/probe'
-require 'pimon/probe/system_memory'
+module Pimon
+  module Probe
+    class MemoryUsage
+      def self.check(date = Time.now)
+        options = {
+          date: date.strftime('%Y-%m-%d %H:%M:%S'), probe_name: 'mem',
+          value: SystemMemory.check(:mem),
+          unit: unit
+        }
+        OpenStruct.new(options)
+      end
 
-class Probe::MemoryUsage < Probe
-  
-  def self.check
-    SystemMemory.check(:mem)
-  end
-  
-  def self.symbol
-    :mem
+      def self.unit
+        '%'
+      end
+    end
   end
 end

data/lib/pimon/probe/swap_usage.rb

@@ -1,13 +1,19 @@
-require 'pimon/probe/probe'
-require 'pimon/probe/system_memory'
+module Pimon
+  module Probe
+    class SwapUsage
+      def self.check(date = Time.now)
+        options = {
+          date: date.strftime('%Y-%m-%d %H:%M:%S'),
+          probe_name: 'swap',
+          value: SystemMemory.check(:swap),
+          unit: unit
+        }
+        OpenStruct.new(options)
+      end
 
-class Probe::SwapUsage < Probe
-  
-  def self.check
-    SystemMemory.check(:swap)
-  end
-  
-  def self.symbol
-    :swap
+      def self.unit
+        '%'
+      end
+    end
   end
 end

data/lib/pimon/probe/system_memory.rb

@@ -1,19 +1,19 @@
-class SystemMemory
-  
-  def self.check(type)
-    case type
-    when :mem
-      index = 1
-    when :swap
-      index = 2
-    else
-      raise "Undefined memory type: #{type}"
+module Pimon
+  module Probe
+    class SystemMemory
+      TYPE_INDEX = {
+        mem: 1,
+        swap: 2
+      }
+
+      def self.check(type)
+        memory = `free -o -m`.split(/\n/)[TYPE_INDEX[type]].split(' ')
+
+        return 0 if memory[1].to_i == 0
+        # memory[1] holds total memory
+        # memory[2] holds used memory
+        ((memory[2].to_f / memory[1].to_f) * 100).to_i
+      end
     end
-    
-    memory = `free -o -m`.split(/\n/)[index].split(" ")
-    
-    # memory[1] holds total memory
-    # memory[2] holds used memory
-    ((memory[2].to_f / memory[1].to_f) * 100).to_i
   end
 end

data/lib/pimon/probe/temperature.rb

@@ -1,16 +1,14 @@
-# encoding: UTF-8
-require 'pimon/probe/probe'
+module Pimon
+  module Probe
+    class Temperature
+      def self.check(date = Time.now)
+        value = `cat /sys/class/thermal/thermal_zone0/temp`[0..1].to_i
+        OpenStruct.new(date: date.strftime('%Y-%m-%d %H:%M:%S'), probe_name: 'temp', value: value, unit: unit)
+      end
 
-class Probe::Temperature < Probe
-  def self.check
-    `cat /sys/class/thermal/thermal_zone0/temp`[0..1].to_i
-  end
-  
-  def self.symbol
-    :temp
-  end
-  
-  def self.unit
-    'ºC'
+      def self.unit
+        'ºC'
+      end
+    end
   end
 end

data/lib/pimon/probe/uptime.rb

@@ -1,13 +1,41 @@
-require 'pimon/probe/probe'
 require 'sys/uptime'
 
-class Probe::Uptime < Probe
-  
-  def self.check
-    Sys::Uptime.dhms
-  end
-  
-  def self.symbol
-    :uptime
+module Pimon
+  module Probe
+    class Uptime
+      def self.check(date = Time.now)
+        OpenStruct.new(date: date.strftime('%Y-%m-%d %H:%M:%S'), probe_name: 'uptime', value: formatted_uptime)
+      end
+
+      def self.formatted_uptime
+        days, hours, minutes, seconds = Sys::Uptime.dhms.map(&:to_i)
+
+        uptime = ''
+        { day: days, hour: hours, minute: minutes, second: seconds }.each do |time_unit, value|
+          next if value == 0
+          case time_unit
+          when :day
+            uptime = "#{days}#{pluralize(value, time_unit)}"
+          when :second
+            uptime = "#{insert_word_connector(uptime, ' and ')}#{value}#{pluralize(value, time_unit)}"
+          when :hour, :minute
+            uptime = "#{insert_word_connector(uptime, ', ')}#{value}#{pluralize(value, time_unit)}"
+          end
+        end
+        uptime
+      end
+
+      def self.pluralize(count, word)
+        " #{word}#{count == 1 ? '' : 's'}"
+      end
+
+      def self.insert_word_connector(text, connector)
+        "#{text}#{text == '' ? '' : connector}"
+      end
+
+      def self.unit
+        nil
+      end
+    end
   end
 end

data/lib/pimon/public/index.js

@@ -4,17 +4,25 @@ $(function () {
       rotateFaviconInterval,
       ws;
   
-  function changeFavicon(o) {
-    titleStats = [
-      { 'legend' : 'CPU', 'stat' : o.cpu.stats[o.cpu.stats.length - 1], 'color' : o.cpu.color, 'unit' : o.cpu.unit } ,
-      { 'legend' : 'MEM', 'stat' : o.mem.stats[o.mem.stats.length - 1], 'color' : o.mem.color, 'unit' : o.mem.unit } ,
-      { 'legend' : 'SWAP', 'stat' : o.swap.stats[o.swap.stats.length - 1], 'color' : o.swap.color, 'unit' : o.swap.unit},
-      { 'legend' : 'DISK', 'stat' : o.disk.stats[o.disk.stats.length - 1], 'color' : o.disk.color, 'unit' : o.disk.unit},
-      { 'legend' : 'TEMP', 'stat' : o.temp.stats[o.temp.stats.length - 1], 'color' : o.temp.color, 'unit' : o.temp.unit} ];
+  function changeFavicon(chartStats) {
+    titleStats = [];
+
+    for (var probe in chartStats) {
+      if (probe !== 'colors') {
+        var pieChartOption = {
+          'legend' : probe,
+          'stat' : chartStats[probe].value,
+          'color' : stats.colors[probe],
+          'unit' : chartStats[probe].unit
+        }
+        titleStats.push(pieChartOption);
+      }
+    }
+
     i = 0;
     if (rotateFaviconInterval === undefined) {
       rotateFavicon(titleStats);
-      rotateFaviconInterval = setInterval(function() { rotateFavicon(titleStats); }, 3000);
+      rotateFaviconInterval = setInterval(function() { rotateFavicon(titleStats); }, 2000);
     }
   }
   
@@ -33,122 +41,54 @@ $(function () {
       i = 0;
     }
   }
-  
-  function drawChart(o) {
-    new Highcharts.Chart({
-      chart: {
-        renderTo: 'chart',
-        type: 'line',
-        marginRight: 130,
-        marginBottom: 25
-      },
-      title: {
-        text: 'Pimon',
-        x: -20
-      },
-      subtitle: {
-        text: o.hostname,
-        x: -20
-      },
-      xAxis: {
-        categories: o.time.stats
-      },
-      yAxis: {
-        title: {
-            text: 'Usage'
-        },
-        plotLines: [{
-            value: 0,
-            width: 1,
-            color: '#808080'
-        }],
-        max: 100,
-        min: 0
-      },
-      tooltip: {
-        formatter: function() {
-          return '<b>'+ this.series.name +'</b><br/>'+
-          this.x +': '+ this.y + (this.series.name === 'temp' ? o.temp.unit : '%');
-        }
-      },
-      legend: {
-        layout: 'vertical',
-        align: 'right',
-        verticalAlign: 'top',
-        x: -10,
-        y: 100,
-        borderWidth: 0
-      },
-      series: [{
-        name: 'cpu',
-        color: o.cpu.color,
-        data: o.cpu.stats
-      },
-      {
-        name: 'mem',
-        color: o.mem.color,
-        data: o.mem.stats
-      },
-      {
-        name: 'swap',
-        color: o.swap.color,
-        data: o.swap.stats
-      },
-      {
-        name: 'disk',
-        color: o.disk.color,
-        data: o.disk.stats
-      },
-      {
-        name: 'temp',
-        color: o.temp.color,
-        data: o.temp.stats
-      }],
-      credits: {
-        enabled: false
+
+  function updateSingleStats(singleStats) {
+    for (var probe in singleStats) {
+      var probeReading = stats.single[probe].value;
+
+      if (stats.single[probe].unit !== undefined) {
+        probeReading = probeReading + ' ' + stats.single[probe].unit;
       }
-    });
-  }
-  
-  function maybeInsertWordConnector(text, connector) {
-    return text !== '' ? text + connector : text;
-  }
-  
-  function pluralize(count, word) {
-    return ((count === '1') ? ' ' + word : ' ' + word + 's');
-  }
-  
-  function formatUptime(uptimeArray) {
-    var uptime = '',
-        days =    uptimeArray[0],
-        hours =   uptimeArray[1],
-        minutes = uptimeArray[2],
-        seconds = uptimeArray[3];
-    
-    if (days !== '0') {
-      uptime = days + ' ' + pluralize(days, 'day');
-    }
-    
-    if (hours !== '0') {
-      uptime = maybeInsertWordConnector(uptime, ', ') + hours + ' ' + pluralize(hours, 'hour');
+
+      $('#' + probe + ' .stat').text(probeReading);
     }
-    
-    if (minutes !== '0') {
-      uptime = maybeInsertWordConnector(uptime, ', ') + minutes + ' ' + pluralize(minutes, 'minute');
-    }
-    
-    if (seconds !== '0') {
-      uptime = maybeInsertWordConnector(uptime, ' and ') + seconds + ' ' + pluralize(seconds, 'second');
+  }
+
+  function updateCharts(chartStats) {
+    for (var probe in chartStats) {
+      if (chartTimeSeries[probe] === undefined) {
+        chartTimeSeries[probe] = new TimeSeries();
+      }
+      if (charts[probe] === undefined) {
+        chartOptions = {
+          millisPerPixel: 100,
+          maxValue: 100,
+          minValue: 0,
+          grid:{ millisPerLine: 10000 },
+          timestampFormatter:SmoothieChart.timeFormatter
+        }
+        
+        charts[probe] = new SmoothieChart(chartOptions);
+
+        charts[probe].addTimeSeries(chartTimeSeries[probe], { strokeStyle: stats.colors[probe], fillStyle: 'rgba(0, 255, 0, 0.2)', lineWidth: 2 });
+        charts[probe].streamTo(document.getElementById(probe + '_chart'), 10000);
+      }
+      chartTimeSeries[probe].append(Date.parse(chartStats[probe].date), chartStats[probe].value);
     }
-    return uptime;
   }
-  
-  ws = new WebSocket('ws://' + window.location.host + window.location.pathname);
+
+  var chartTimeSeries = [],
+      charts = [],
+      ws = new WebSocket('ws://' + window.location.host + '/stats'),
+      stats;
+
   ws.onclose = function()  { alert('Connection to Pimon server lost...'); };
-  ws.onmessage = function(m) {
-    var o = $.parseJSON(m.data);
-    drawChart(o);
-    changeFavicon(o);
-    $('#uptime .up').text(formatUptime(o.uptime.slice(-1)[0]));
+
+  ws.onmessage = function(message) {
+    stats = $.parseJSON(message.data);
+
+    updateSingleStats(stats.single);
+    updateCharts(stats.charts);
+    changeFavicon(stats.charts);
   };
 });

data/lib/pimon/public/normalize.css

@@ -0,0 +1,427 @@
+/*! normalize.css v3.0.2 | MIT License | git.io/normalize */
+
+/**
+ * 1. Set default font family to sans-serif.
+ * 2. Prevent iOS text size adjust after orientation change, without disabling
+ *    user zoom.
+ */
+
+html {
+  font-family: sans-serif; /* 1 */
+  -ms-text-size-adjust: 100%; /* 2 */
+  -webkit-text-size-adjust: 100%; /* 2 */
+}
+
+/**
+ * Remove default margin.
+ */
+
+body {
+  margin: 0;
+}
+
+/* HTML5 display definitions
+   ========================================================================== */
+
+/**
+ * Correct `block` display not defined for any HTML5 element in IE 8/9.
+ * Correct `block` display not defined for `details` or `summary` in IE 10/11
+ * and Firefox.
+ * Correct `block` display not defined for `main` in IE 11.
+ */
+
+article,
+aside,
+details,
+figcaption,
+figure,
+footer,
+header,
+hgroup,
+main,
+menu,
+nav,
+section,
+summary {
+  display: block;
+}
+
+/**
+ * 1. Correct `inline-block` display not defined in IE 8/9.
+ * 2. Normalize vertical alignment of `progress` in Chrome, Firefox, and Opera.
+ */
+
+audio,
+canvas,
+progress,
+video {
+  display: inline-block; /* 1 */
+  vertical-align: baseline; /* 2 */
+}
+
+/**
+ * Prevent modern browsers from displaying `audio` without controls.
+ * Remove excess height in iOS 5 devices.
+ */
+
+audio:not([controls]) {
+  display: none;
+  height: 0;
+}
+
+/**
+ * Address `[hidden]` styling not present in IE 8/9/10.
+ * Hide the `template` element in IE 8/9/11, Safari, and Firefox < 22.
+ */
+
+[hidden],
+template {
+  display: none;
+}
+
+/* Links
+   ========================================================================== */
+
+/**
+ * Remove the gray background color from active links in IE 10.
+ */
+
+a {
+  background-color: transparent;
+}
+
+/**
+ * Improve readability when focused and also mouse hovered in all browsers.
+ */
+
+a:active,
+a:hover {
+  outline: 0;
+}
+
+/* Text-level semantics
+   ========================================================================== */
+
+/**
+ * Address styling not present in IE 8/9/10/11, Safari, and Chrome.
+ */
+
+abbr[title] {
+  border-bottom: 1px dotted;
+}
+
+/**
+ * Address style set to `bolder` in Firefox 4+, Safari, and Chrome.
+ */
+
+b,
+strong {
+  font-weight: bold;
+}
+
+/**
+ * Address styling not present in Safari and Chrome.
+ */
+
+dfn {
+  font-style: italic;
+}
+
+/**
+ * Address variable `h1` font-size and margin within `section` and `article`
+ * contexts in Firefox 4+, Safari, and Chrome.
+ */
+
+h1 {
+  font-size: 2em;
+  margin: 0.67em 0;
+}
+
+/**
+ * Address styling not present in IE 8/9.
+ */
+
+mark {
+  background: #ff0;
+  color: #000;
+}
+
+/**
+ * Address inconsistent and variable font size in all browsers.
+ */
+
+small {
+  font-size: 80%;
+}
+
+/**
+ * Prevent `sub` and `sup` affecting `line-height` in all browsers.
+ */
+
+sub,
+sup {
+  font-size: 75%;
+  line-height: 0;
+  position: relative;
+  vertical-align: baseline;
+}
+
+sup {
+  top: -0.5em;
+}
+
+sub {
+  bottom: -0.25em;
+}
+
+/* Embedded content
+   ========================================================================== */
+
+/**
+ * Remove border when inside `a` element in IE 8/9/10.
+ */
+
+img {
+  border: 0;
+}
+
+/**
+ * Correct overflow not hidden in IE 9/10/11.
+ */
+
+svg:not(:root) {
+  overflow: hidden;
+}
+
+/* Grouping content
+   ========================================================================== */
+
+/**
+ * Address margin not present in IE 8/9 and Safari.
+ */
+
+figure {
+  margin: 1em 40px;
+}
+
+/**
+ * Address differences between Firefox and other browsers.
+ */
+
+hr {
+  -moz-box-sizing: content-box;
+  box-sizing: content-box;
+  height: 0;
+}
+
+/**
+ * Contain overflow in all browsers.
+ */
+
+pre {
+  overflow: auto;
+}
+
+/**
+ * Address odd `em`-unit font size rendering in all browsers.
+ */
+
+code,
+kbd,
+pre,
+samp {
+  font-family: monospace, monospace;
+  font-size: 1em;
+}
+
+/* Forms
+   ========================================================================== */
+
+/**
+ * Known limitation: by default, Chrome and Safari on OS X allow very limited
+ * styling of `select`, unless a `border` property is set.
+ */
+
+/**
+ * 1. Correct color not being inherited.
+ *    Known issue: affects color of disabled elements.
+ * 2. Correct font properties not being inherited.
+ * 3. Address margins set differently in Firefox 4+, Safari, and Chrome.
+ */
+
+button,
+input,
+optgroup,
+select,
+textarea {
+  color: inherit; /* 1 */
+  font: inherit; /* 2 */
+  margin: 0; /* 3 */
+}
+
+/**
+ * Address `overflow` set to `hidden` in IE 8/9/10/11.
+ */
+
+button {
+  overflow: visible;
+}
+
+/**
+ * Address inconsistent `text-transform` inheritance for `button` and `select`.
+ * All other form control elements do not inherit `text-transform` values.
+ * Correct `button` style inheritance in Firefox, IE 8/9/10/11, and Opera.
+ * Correct `select` style inheritance in Firefox.
+ */
+
+button,
+select {
+  text-transform: none;
+}
+
+/**
+ * 1. Avoid the WebKit bug in Android 4.0.* where (2) destroys native `audio`
+ *    and `video` controls.
+ * 2. Correct inability to style clickable `input` types in iOS.
+ * 3. Improve usability and consistency of cursor style between image-type
+ *    `input` and others.
+ */
+
+button,
+html input[type="button"], /* 1 */
+input[type="reset"],
+input[type="submit"] {
+  -webkit-appearance: button; /* 2 */
+  cursor: pointer; /* 3 */
+}
+
+/**
+ * Re-set default cursor for disabled elements.
+ */
+
+button[disabled],
+html input[disabled] {
+  cursor: default;
+}
+
+/**
+ * Remove inner padding and border in Firefox 4+.
+ */
+
+button::-moz-focus-inner,
+input::-moz-focus-inner {
+  border: 0;
+  padding: 0;
+}
+
+/**
+ * Address Firefox 4+ setting `line-height` on `input` using `!important` in
+ * the UA stylesheet.
+ */
+
+input {
+  line-height: normal;
+}
+
+/**
+ * It's recommended that you don't attempt to style these elements.
+ * Firefox's implementation doesn't respect box-sizing, padding, or width.
+ *
+ * 1. Address box sizing set to `content-box` in IE 8/9/10.
+ * 2. Remove excess padding in IE 8/9/10.
+ */
+
+input[type="checkbox"],
+input[type="radio"] {
+  box-sizing: border-box; /* 1 */
+  padding: 0; /* 2 */
+}
+
+/**
+ * Fix the cursor style for Chrome's increment/decrement buttons. For certain
+ * `font-size` values of the `input`, it causes the cursor style of the
+ * decrement button to change from `default` to `text`.
+ */
+
+input[type="number"]::-webkit-inner-spin-button,
+input[type="number"]::-webkit-outer-spin-button {
+  height: auto;
+}
+
+/**
+ * 1. Address `appearance` set to `searchfield` in Safari and Chrome.
+ * 2. Address `box-sizing` set to `border-box` in Safari and Chrome
+ *    (include `-moz` to future-proof).
+ */
+
+input[type="search"] {
+  -webkit-appearance: textfield; /* 1 */
+  -moz-box-sizing: content-box;
+  -webkit-box-sizing: content-box; /* 2 */
+  box-sizing: content-box;
+}
+
+/**
+ * Remove inner padding and search cancel button in Safari and Chrome on OS X.
+ * Safari (but not Chrome) clips the cancel button when the search input has
+ * padding (and `textfield` appearance).
+ */
+
+input[type="search"]::-webkit-search-cancel-button,
+input[type="search"]::-webkit-search-decoration {
+  -webkit-appearance: none;
+}
+
+/**
+ * Define consistent border, margin, and padding.
+ */
+
+fieldset {
+  border: 1px solid #c0c0c0;
+  margin: 0 2px;
+  padding: 0.35em 0.625em 0.75em;
+}
+
+/**
+ * 1. Correct `color` not being inherited in IE 8/9/10/11.
+ * 2. Remove padding so people aren't caught out if they zero out fieldsets.
+ */
+
+legend {
+  border: 0; /* 1 */
+  padding: 0; /* 2 */
+}
+
+/**
+ * Remove default vertical scrollbar in IE 8/9/10/11.
+ */
+
+textarea {
+  overflow: auto;
+}
+
+/**
+ * Don't inherit the `font-weight` (applied by a rule above).
+ * NOTE: the default cannot safely be changed in Chrome and Safari on OS X.
+ */
+
+optgroup {
+  font-weight: bold;
+}
+
+/* Tables
+   ========================================================================== */
+
+/**
+ * Remove most spacing between table cells.
+ */
+
+table {
+  border-collapse: collapse;
+  border-spacing: 0;
+}
+
+td,
+th {
+  padding: 0;
+}