pghero 1.4.1 → 1.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 37b92864838cd5c201e6223ae5cf72b9b7f4c763
-  data.tar.gz: e5b56c6c3798ff5fc735af5a5f721d7d9b850b97
+  metadata.gz: 9d9c1570453baf5503a063836e716a0ce38307a6
+  data.tar.gz: 5a46751a5c8d2e95a801f963104256fbecbcb892
 SHA512:
-  metadata.gz: e9b5eba16f3d7a5da62987f35ec3fafbc62283bbd6bb079d07b2cf2836670c4cc0e41e5efe05b101a7f0af8c2aeac405dbcd71764da981c6bf04421fa00e091c
-  data.tar.gz: 486223410c07162fd6149c2858d9ef7614188b290024da9047ce84a08a57cc992206241363c2aeb6c70f68de6304d3ea1c8024c82071ebe8fc39c4b322e54f7a
+  metadata.gz: c745ed76512b199321bb518c3e914c9e96e1f89c521e72bd3f357db1c566b032fa1ddc5cc05978e24352f7e8a613e3479ea81065508b66b32cbaeca70846b2b0
+  data.tar.gz: cdcd785bebe95c345c6152fa338fa617dad4f0efa7b287a2f692e2f5db5b8eba745ad4156612332784aa242c25cfcb139182aa71beb5fea0fb80959880bf80e8

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 1.4.2
+
+- Fixed `wrong constant name` error in development
+- Added different periods for system stats
+
 ## 1.4.1
 
 - Removed external assets

data/README.md

@@ -1,6 +1,6 @@
 # PgHero
 
-The missing dashboard for Postgres
+A performance dashboard for Postgres
 
 [See it in action](https://pghero.herokuapp.com/)
 

data/app/assets/stylesheets/pghero/application.css

@@ -407,3 +407,11 @@ body {
 .noUi-origin {
   border-radius: 0;
 }
+
+#periods {
+  text-align: center;
+}
+
+#periods a {
+  margin-right: 20px;
+}

data/app/controllers/pg_hero/home_controller.rb

@@ -107,24 +107,30 @@ module PgHero
 
     def system
       @title = "System"
+      @periods = {
+        "1 hour" => {duration: 1.hour, period: 60.seconds},
+        "1 day" => {duration: 1.day, period: 10.minutes},
+        "1 week" => {duration: 1.week, period: 30.minutes},
+        "2 weeks" => {duration: 2.weeks, period: 1.hours}
+      }
     end
 
     def cpu_usage
-      render json: PgHero.cpu_usage.map { |k, v| [k, v.round] }
+      render json: [{name: "CPU", data: PgHero.cpu_usage(system_params).map { |k, v| [k, v.round] }, library: chart_library_options}]
     end
 
     def connection_stats
-      render json: PgHero.connection_stats
+      render json: [{name: "Connections", data: PgHero.connection_stats(system_params), library: chart_library_options}]
     end
 
     def replication_lag_stats
-      render json: PgHero.replication_lag_stats
+      render json: [{name: "Lag", data: PgHero.replication_lag_stats(system_params), library: chart_library_options}]
     end
 
     def load_stats
       render json: [
-        {name: "Read IOPS", data: PgHero.read_iops_stats.map { |k, v| [k, v.round] }},
-        {name: "Write IOPS", data: PgHero.write_iops_stats.map { |k, v| [k, v.round] }}
+        {name: "Read IOPS", data: PgHero.read_iops_stats(system_params).map { |k, v| [k, v.round] }, library: chart_library_options},
+        {name: "Write IOPS", data: PgHero.write_iops_stats(system_params).map { |k, v| [k, v.round] }, library: chart_library_options}
       ]
     end
 
@@ -225,5 +231,13 @@ module PgHero
       @query_stats_by_query = @query_stats.index_by { |q| q["query"] }
       @debug = params[:debug] == "true"
     end
+
+    def system_params
+      params.slice(:duration, :period)
+    end
+
+    def chart_library_options
+      {pointRadius: 0, pointHitRadius: 5, borderWidth: 4}
+    end
   end
 end

data/app/views/pg_hero/home/system.html.erb

@@ -1,15 +1,22 @@
 <div class="content">
+  <p id="periods">
+    <% @periods.each do |name, options| %>
+      <%= link_to name, system_path(options) %>
+    <% end %>
+  </p>
+  <% path_options = params.slice(:duration, :period) %>
+
   <h1>CPU</h1>
-  <div style="margin-bottom: 20px;"><%= line_chart cpu_usage_path, max: 100, colors: ["#5bc0de"] %></div>
+  <div style="margin-bottom: 20px;"><%= line_chart cpu_usage_path(path_options), max: 100, colors: ["#5bc0de"] %></div>
 
   <h1>Load</h1>
-  <div style="margin-bottom: 20px;"><%= line_chart load_stats_path, colors: ["#5bc0de", "#d9534f"] %></div>
+  <div style="margin-bottom: 20px;"><%= line_chart load_stats_path(path_options), colors: ["#5bc0de", "#d9534f"] %></div>
 
   <h1>Connections</h1>
-  <div style="margin-bottom: 20px;"><%= line_chart connection_stats_path, colors: ["#5bc0de"] %></div>
+  <div style="margin-bottom: 20px;"><%= line_chart connection_stats_path(path_options), colors: ["#5bc0de"] %></div>
 
   <% if PgHero.replica? %>
     <h1>Replication Lag</h1>
-    <div style="margin-bottom: 20px;"><%= line_chart replication_lag_stats_path, colors: ["#5bc0de"] %></div>
+    <div style="margin-bottom: 20px;"><%= line_chart replication_lag_stats_path(path_options), colors: ["#5bc0de"] %></div>
   <% end %>
 </div>

data/lib/pghero/database.rb

@@ -12,7 +12,7 @@ module PgHero
         url = config["url"]
         Class.new(PgHero::Connection) do
           def self.name
-            "PgHero::Connection::#{object_id}"
+            "PgHero::Connection::Database#{object_id}"
           end
           establish_connection(url) if url
         end

data/lib/pghero/methods/system.rb

@@ -1,27 +1,27 @@
 module PgHero
   module Methods
     module System
-      def cpu_usage
-        rds_stats("CPUUtilization")
+      def cpu_usage(options = {})
+        rds_stats("CPUUtilization", options)
       end
 
-      def connection_stats
-        rds_stats("DatabaseConnections")
+      def connection_stats(options = {})
+        rds_stats("DatabaseConnections", options)
       end
 
-      def replication_lag_stats
-        rds_stats("ReplicaLag")
+      def replication_lag_stats(options = {})
+        rds_stats("ReplicaLag", options)
       end
 
-      def read_iops_stats
-        rds_stats("ReadIOPS")
+      def read_iops_stats(options = {})
+        rds_stats("ReadIOPS", options)
       end
 
-      def write_iops_stats
-        rds_stats("WriteIOPS")
+      def write_iops_stats(options = {})
+        rds_stats("WriteIOPS", options)
       end
 
-      def rds_stats(metric_name)
+      def rds_stats(metric_name, options = {})
         if system_stats_enabled?
           client =
             if defined?(Aws)
@@ -30,14 +30,21 @@ module PgHero
               AWS::CloudWatch.new(access_key_id: access_key_id, secret_access_key: secret_access_key, region: region).client
             end
 
-          now = Time.now
+          duration = (options[:duration] || 1.hour).to_i
+          period = (options[:period] || 1.minute).to_i
+          offset = (options[:offset] || 0).to_i
+
+          end_time = (Time.now - offset)
+          # ceil period
+          end_time = Time.at((end_time.to_f / period).ceil * period)
+
           resp = client.get_metric_statistics(
             namespace: "AWS/RDS",
             metric_name: metric_name,
             dimensions: [{name: "DBInstanceIdentifier", value: db_instance_identifier}],
-            start_time: (now - 1 * 3600).iso8601,
-            end_time: now.iso8601,
-            period: 60,
+            start_time: (end_time - duration).iso8601,
+            end_time: end_time.iso8601,
+            period: period,
             statistics: ["Average"]
           )
           data = {}

data/lib/pghero/version.rb

@@ -1,3 +1,3 @@
 module PgHero
-  VERSION = "1.4.1"
+  VERSION = "1.4.2"
 end

data/pghero.gemspec

@@ -8,8 +8,8 @@ Gem::Specification.new do |spec|
   spec.version       = PgHero::VERSION
   spec.authors       = ["Andrew Kane"]
   spec.email         = ["andrew@chartkick.com"]
-  spec.summary       = "The missing dashboard for Postgres"
-  spec.description   = "The missing dashboard for Postgres"
+  spec.summary       = "A performance dashboard for Postgres"
+  spec.description   = "A performance dashboard for Postgres"
   spec.homepage      = "https://github.com/ankane/pghero"
   spec.license       = "MIT"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pghero
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.4.2
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-26 00:00:00.000000000 Z
+date: 2016-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -108,7 +108,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: The missing dashboard for Postgres
+description: A performance dashboard for Postgres
 email:
 - andrew@chartkick.com
 executables: []
@@ -205,10 +205,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
-summary: The missing dashboard for Postgres
+summary: A performance dashboard for Postgres
 test_files:
 - guides/Docker.md
 - guides/Heroku.md
@@ -222,4 +222,3 @@ test_files:
 - test/gemfiles/activerecord42.gemfile
 - test/suggested_indexes_test.rb
 - test/test_helper.rb
-has_rdoc: