pghero 2.5.0 → 2.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 252b8c1bb7580d67b149ef865f97b99a89fbd9aecb640a92f5ebf8a532d7c10b
-  data.tar.gz: 87a9df921265875867cb9d9b0dcd92fa6d6855075818129a8b5bf47337277354
+  metadata.gz: 8e147c844a9c109baa794e9a3950e747539e2b15f19b781e9822edaed5f216ff
+  data.tar.gz: e18d81b6876148607514621d96b7b84f9436081f7eb4660008cbf3148578bbe5
 SHA512:
-  metadata.gz: 9b1f75f5ef19ee10da7ee815aca9ee7933fa89ae78046e495417f7c863f383172fba28bfb00605ac8810a2bb5a9895ae478a3f182ba36204080151f84ad9e2a6
-  data.tar.gz: 6fc630bd5f46fbecb5b6194d58726397c8f28a812e7ceabe12784ed6892bd7f7609646cba22e57c34ab817be40b37e251384f5ba23a32e82199db7620f4dc009
+  metadata.gz: 1eea90a86822be5ee51a1b0b34e5e86297909a6bb41d4cf6589162285b8d2414b63c119cfba7d4df5b6f78d0b755ff517b47420c1ddd27a0cadcc51f0305f465
+  data.tar.gz: afc7bb09d979dada5636a8056ae1d692b88d8fc0cfda0af8d81f02a4a413499027953c4506c7a627da27c5c9b9f87aca1c030d76a0caa758773c6483c4ac171a

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 2.5.1 (2020-06-23)
+
+- Added support for `google-cloud-monitoring` >= 1
+- Added support for `google-cloud-monitoring-v3`
+- Fixed system stats not showing up in Rails 6 with environment variables
+
 ## 2.5.0 (2020-05-24)
 
 - Added system stats for Google Cloud SQL and Azure Database

data/lib/generators/pghero/templates/config.yml.tt

@@ -32,14 +32,14 @@ databases:
 
 # Basic authentication
 # username: admin
-# password: secret
+# password: <%%= ENV["PGHERO_PASSWORD"] %>
 
 # Stats database URL (defaults to app database)
 # stats_database_url: <%%= ENV["PGHERO_STATS_DATABASE_URL"] %>
 
 # AWS configuration (defaults to app AWS config)
-# aws_access_key_id: ...
-# aws_secret_access_key: ...
+# aws_access_key_id: <%%= ENV["AWS_ACCESS_KEY_ID"] %>
+# aws_secret_access_key: <%%= ENV["AWS_SECRET_ACCESS_KEY"] %>
 # aws_region: us-east-1
 
 # Filter data from queries (experimental)

data/lib/pghero.rb

@@ -119,11 +119,16 @@ module PgHero
 
           if databases.empty?
             databases["primary"] = {
-              "url" => ENV["PGHERO_DATABASE_URL"] || ActiveRecord::Base.connection_config,
+              "url" => ENV["PGHERO_DATABASE_URL"] || ActiveRecord::Base.connection_config
+            }
+          end
+
+          if databases.size == 1
+            databases.values.first.merge!(
               "db_instance_identifier" => ENV["PGHERO_DB_INSTANCE_IDENTIFIER"],
               "gcp_database_id" => ENV["PGHERO_GCP_DATABASE_ID"],
               "azure_resource_id" => ENV["PGHERO_AZURE_RESOURCE_ID"]
-            }
+            )
           end
 
           {

data/lib/pghero/methods/system.rb

@@ -5,7 +5,7 @@ module PgHero
         !system_stats_provider.nil?
       end
 
-      # TODO require AWS 2+ automatically
+      # TODO remove defined checks in 3.0
       def system_stats_provider
         if aws_db_instance_identifier && (defined?(Aws) || defined?(AWS))
           :aws
@@ -133,7 +133,7 @@ module PgHero
       private
 
       def gcp_stats(metric_name, duration: nil, period: nil, offset: nil, series: false)
-        require "google/cloud/monitoring"
+        require "google/cloud/monitoring/v3"
 
         # TODO DRY with RDS stats
         duration = (duration || 1.hour).to_i
@@ -142,30 +142,63 @@ module PgHero
         end_time = Time.at(((Time.now - offset).to_f / period).ceil * period)
         start_time = end_time - duration
 
-        client = Google::Cloud::Monitoring::Metric.new
-
-        interval = Google::Monitoring::V3::TimeInterval.new
-        interval.end_time = Google::Protobuf::Timestamp.new(seconds: end_time.to_i)
-        # subtract period to make sure we get first data point
-        interval.start_time = Google::Protobuf::Timestamp.new(seconds: (start_time - period).to_i)
-
-        aggregation = Google::Monitoring::V3::Aggregation.new
-        # may be better to use ALIGN_NEXT_OLDER for space stats to show most recent data point
-        # stick with average for now to match AWS
-        aggregation.per_series_aligner = Google::Monitoring::V3::Aggregation::Aligner::ALIGN_MEAN
-        aggregation.alignment_period = period
-
         # validate input since we need to interpolate below
         raise Error, "Invalid metric name" unless metric_name =~ /\A[a-z\/_]+\z/i
         raise Error, "Invalid database id" unless gcp_database_id =~ /\A[a-z\-:]+\z/i
 
-        results = client.list_time_series(
-          "projects/#{gcp_database_id.split(":").first}",
-          "metric.type = \"cloudsql.googleapis.com/database/#{metric_name}\" AND resource.label.database_id = \"#{gcp_database_id}\"",
-          interval,
-          Google::Monitoring::V3::ListTimeSeriesRequest::TimeSeriesView::FULL,
-          aggregation: aggregation
-        )
+        # we handle three situations:
+        # 1. google-cloud-monitoring-v3
+        # 2. google-cloud-monitoring >= 1
+        # 3. google-cloud-monitoring < 1
+
+        # for situations 1 and 2
+        # Google::Cloud::Monitoring.metric_service is documented
+        # but doesn't work for situation 1
+        if defined?(Google::Cloud::Monitoring::V3::MetricService::Client)
+          client = Google::Cloud::Monitoring::V3::MetricService::Client.new
+
+          interval = Google::Cloud::Monitoring::V3::TimeInterval.new
+          interval.end_time = Google::Protobuf::Timestamp.new(seconds: end_time.to_i)
+          # subtract period to make sure we get first data point
+          interval.start_time = Google::Protobuf::Timestamp.new(seconds: (start_time - period).to_i)
+
+          aggregation = Google::Cloud::Monitoring::V3::Aggregation.new
+          # may be better to use ALIGN_NEXT_OLDER for space stats to show most recent data point
+          # stick with average for now to match AWS
+          aggregation.per_series_aligner = Google::Cloud::Monitoring::V3::Aggregation::Aligner::ALIGN_MEAN
+          aggregation.alignment_period = period
+
+          results = client.list_time_series({
+            name: "projects/#{gcp_database_id.split(":").first}",
+            filter: "metric.type = \"cloudsql.googleapis.com/database/#{metric_name}\" AND resource.label.database_id = \"#{gcp_database_id}\"",
+            interval: interval,
+            view: Google::Cloud::Monitoring::V3::ListTimeSeriesRequest::TimeSeriesView::FULL,
+            aggregation: aggregation
+          })
+        else
+          require "google/cloud/monitoring"
+
+          client = Google::Cloud::Monitoring::Metric.new
+
+          interval = Google::Monitoring::V3::TimeInterval.new
+          interval.end_time = Google::Protobuf::Timestamp.new(seconds: end_time.to_i)
+          # subtract period to make sure we get first data point
+          interval.start_time = Google::Protobuf::Timestamp.new(seconds: (start_time - period).to_i)
+
+          aggregation = Google::Monitoring::V3::Aggregation.new
+          # may be better to use ALIGN_NEXT_OLDER for space stats to show most recent data point
+          # stick with average for now to match AWS
+          aggregation.per_series_aligner = Google::Monitoring::V3::Aggregation::Aligner::ALIGN_MEAN
+          aggregation.alignment_period = period
+
+          results = client.list_time_series(
+            "projects/#{gcp_database_id.split(":").first}",
+            "metric.type = \"cloudsql.googleapis.com/database/#{metric_name}\" AND resource.label.database_id = \"#{gcp_database_id}\"",
+            interval,
+            Google::Monitoring::V3::ListTimeSeriesRequest::TimeSeriesView::FULL,
+            aggregation: aggregation
+          )
+        end
 
         data = {}
         result = results.first

data/lib/pghero/version.rb

@@ -1,3 +1,3 @@
 module PgHero
-  VERSION = "2.5.0"
+  VERSION = "2.5.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pghero
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 2.5.1
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-24 00:00:00.000000000 Z
+date: 2020-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord