pghero 3.3.2 → 3.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2fa38fa0cc98e7f066698e558c6a6bc59cdc60ed5fd2ecbafe43f9f46918c8a2
-  data.tar.gz: 41510ad944cbd565c62aa02d6996af86ce4764e10cfbd09d1109ee12b2534fae
+  metadata.gz: '002087a8cb8c6db43d1f084fd773aa4c8320c6fe77be3d4f42b6ca55ff91d39d'
+  data.tar.gz: fd4cb80b991e10232d7628604049e25685ae3723c53c7dd3231288b369015976
 SHA512:
-  metadata.gz: dfeb7118ad7d5b2b0170b6e82ef03595725085de2e93e4c6a05eb16a3d7288b4475fe33dc0e86bbbd6f17d4e5bf50df391ce8772a57c0aec77656e822244b264
-  data.tar.gz: 24f21e42883c5148bff431dda7dba11701e109347fc2ee173288cb3378ccf41354c3111074fba46a556b2a280d476caca9b20ba48b3b4b8bae1dee884f738c62
+  metadata.gz: 42a29de1135ce51d59423e0aedafff5261ffea8e93740a40aa80d472a48d01a799349ea9c48f78c027f86d493e342901698707894156b149236ca7e8f101a0a1
+  data.tar.gz: 68e636a77b47b825803c04ef90005827a66ae6abc0dab5f60bde8877f0c0d4aa580daa60c7959042bb0f9f0bb374eda3e885e0903069247a00c7a9a8779945a2

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 3.3.3 (2023-04-18)
+
+- Fixed error with system stats for Azure Database
+
 ## 3.3.2 (2023-04-12)
 
 - Fixed error with suggested indexes and empty statements

data/app/controllers/pg_hero/home_controller.rb

@@ -248,9 +248,16 @@ module PgHero
       stats =
         case @database.system_stats_provider
         when :azure
-          [
-            {name: "IO Consumption", data: @database.azure_stats("io_consumption_percent", **system_params), library: chart_library_options}
-          ]
+          if @database.send(:azure_flexible_server?)
+            [
+              {name: "Read IOPS", data: @database.read_iops_stats(**system_params).map { |k, v| [k, v ? v.round : v] }, library: chart_library_options},
+              {name: "Write IOPS", data: @database.write_iops_stats(**system_params).map { |k, v| [k, v ? v.round : v] }, library: chart_library_options}
+            ]
+          else
+            [
+              {name: "IO Consumption", data: @database.azure_stats("io_consumption_percent", **system_params), library: chart_library_options}
+            ]
+          end
         when :gcp
           [
             {name: "Read Ops", data: @database.read_iops_stats(**system_params).map { |k, v| [k, v ? v.round : v] }, library: chart_library_options},

data/lib/pghero/methods/system.rb

@@ -102,7 +102,8 @@ module PgHero
           end
 
         client = Azure::Monitor::Profiles::Latest::Mgmt::Client.new
-        timespan = "#{start_time.iso8601}/#{end_time.iso8601}"
+        # call utc to convert +00:00 to Z
+        timespan = "#{start_time.utc.iso8601}/#{end_time.utc.iso8601}"
         results = client.metrics.list(
           azure_resource_id,
           metricnames: metric_name,
@@ -269,12 +270,13 @@ module PgHero
             used = azure_stats("storage_used", **options)
             free_space(quota, used)
           else
-            # no read_iops, write_iops
-            # could add io_consumption_percent
+            replication_lag_stat = azure_flexible_server? ? "physical_replication_delay_in_seconds" : "pg_replica_log_delay_in_seconds"
             metrics = {
               cpu: "cpu_percent",
               connections: "active_connections",
-              replication_lag: "pg_replica_log_delay_in_seconds"
+              replication_lag: replication_lag_stat,
+              read_iops: "read_iops", # flexible server only
+              write_iops: "write_iops" # flexible server only
             }
             raise Error, "Metric not supported" unless metrics[metric_key]
             azure_stats(metrics[metric_key], **options)
@@ -284,6 +286,10 @@ module PgHero
         end
       end
 
+      def azure_flexible_server?
+        azure_resource_id.include?("/Microsoft.DBforPostgreSQL/flexibleServers/")
+      end
+
       # only use data points included in both series
       # this also eliminates need to align Time.now
       def free_space(quota, used)

data/lib/pghero/version.rb

@@ -1,3 +1,3 @@
 module PgHero
-  VERSION = "3.3.2"
+  VERSION = "3.3.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pghero
 version: !ruby/object:Gem::Version
-  version: 3.3.2
+  version: 3.3.3
 platform: ruby
 authors:
 - Andrew Kane
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-04-13 00:00:00.000000000 Z
+date: 2023-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord