seira 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: db287b6e4753b077e1b2340e263137e739ac94a8
-  data.tar.gz: 69b980247f1809ec81f478bf402a14eb6e0e1358
+  metadata.gz: 8d89537c56c0c2a5fc49a16238d2b063e55806d7
+  data.tar.gz: 3f4231dd7aa7ea3717d146f49c751068992a957f
 SHA512:
-  metadata.gz: ac64bd6b4fc973a71c4bc97666ec4b52878cddff5d432ea2af47ef37b6f83a9fdf7a85483b0a78013b8ba9e6f7002c02d0d850496c89061b789585fa0f86dbf9
-  data.tar.gz: 2422fd823be52e7e6294b9e76564c147ee73a3c043d713c5d0b4943f38c3758f8be8da0957df327a8a9cd7a6f1f015b93d6d0eee841065e30f4c431f07069f6a
+  metadata.gz: 2068e219e27356551e61d964806ab43ec229dc5b6f6b2aee665495c5d27a3006664e08dc0f4640c0058d0d21a134e7c08f24d64e45a95fa95f9b70d3a8cb3bb3
+  data.tar.gz: 95678bb5225c5065bf3a9cfcf67a81950e835aa9d95f2c2cd8cc7ba537d4624466cb28534d476b679d9a4e00665e4991c053a7076eb75dbb4e55a9d8447f8e7c

data/lib/helpers.rb

@@ -8,6 +8,11 @@ module Seira
           context[:cluster]
         end
       end
+
+      def fetch_pods(filters:, app:)
+        filter_string = { app: app }.merge(filters).map { |k, v| "#{k}=#{v}" }.join(',')
+        JSON.parse(`kubectl get pods --namespace=#{app} -o json --selector=#{filter_string}`)['items']
+      end
     end
   end
 end

data/lib/seira.rb

@@ -4,6 +4,7 @@ require 'colorize'
 require 'tmpdir'
 
 require "seira/version"
+require 'helpers'
 require 'seira/app'
 require 'seira/cluster'
 require 'seira/memcached'
@@ -67,8 +68,16 @@ module Seira
         @args = reversed_args.reverse
       end
 
-      @cluster = @settings.full_cluster_name_for_shorthand(cluster)
-      @project = @settings.project_for_cluster(@cluster)
+      @cluster =
+        if category == 'setup' && cluster == 'all'
+          cluster
+        else
+          @settings.full_cluster_name_for_shorthand(cluster)
+        end
+
+      unless category == 'setup' && cluster == 'all'
+        @project = @settings.project_for_cluster(@cluster)
+      end
     end
 
     def run

data/lib/seira/db.rb

@@ -4,7 +4,7 @@ require_relative 'db/create'
 
 module Seira
   class Db
-    VALID_ACTIONS = %w[help create delete list restart connect].freeze
+    VALID_ACTIONS = %w[help create delete list restart connect ps kill analyze].freeze
     SUMMARY = "Manage your Cloud SQL Postgres databases.".freeze
 
     attr_reader :app, :action, :args, :context
@@ -30,6 +30,12 @@ module Seira
         run_restart
       when 'connect'
         run_connect
+      when 'ps'
+        run_ps
+      when 'kill'
+        run_kill
+      when 'analyze'
+        run_analyze
       else
         fail "Unknown command encountered"
       end
@@ -57,6 +63,9 @@ module Seira
       puts "list: List all postgres instances."
       puts "restart: Fully restart the database."
       puts "connect: Open a psql command prompt. You will be shown the password needed before the prompt opens."
+      puts "ps: List running queries"
+      puts "kill: Kill a query"
+      puts "analyze: Display database performance information"
     end
 
     def run_create
@@ -96,6 +105,89 @@ module Seira
       system("gcloud sql connect #{name}")
     end
 
+    def run_ps
+      verbose = false
+      args.each do |arg|
+        if %w[--verbose -v].include? arg
+          verbose = true
+        else
+          puts "Warning: unrecognized argument #{arg}"
+        end
+      end
+
+      execute_db_command(<<~SQL
+        SELECT
+          pid,
+          state,
+          application_name AS source,
+          age(now(),query_start) AS running_for,
+          query_start,
+          wait_event IS NOT NULL AS waiting,
+          query
+        FROM pg_stat_activity
+        WHERE
+          query <> '<insufficient privilege>'
+          #{verbose ? '' : "AND state <> 'idle'"}
+          AND pid <> pg_backend_pid()
+        ORDER BY query_start DESC
+        SQL
+      )
+    end
+
+    def run_kill
+      force = false
+      pid = nil
+
+      args.each do |arg|
+        if %w[--force -f].include? arg
+          force = true
+        elsif /^\d+$/.match? arg
+          if pid.nil?
+            pid = arg
+          else
+            puts 'Must specify only one PID'
+            exit 1
+          end
+        else
+          puts "Warning: unrecognized argument #{arg}"
+        end
+      end
+
+      execute_db_command("SELECT #{force ? 'pg_terminate_backend' : 'pg_cancel_backend'}(#{pid})")
+    end
+
+    def run_analyze
+      puts 'Cache Hit Rates'.bold
+      execute_db_command(
+        <<~SQL
+          SELECT sum(heap_blks_read) as heap_read, sum(heap_blks_hit)  as heap_hit, (sum(heap_blks_hit) - sum(heap_blks_read)) / sum(heap_blks_hit) as ratio
+          FROM pg_statio_user_tables;
+        SQL
+      )
+
+      puts 'Index Usage Rates'.bold
+      execute_db_command(
+        <<~SQL
+          SELECT relname, 100 * idx_scan / (seq_scan + idx_scan) percent_of_times_index_used, n_live_tup rows_in_table
+          FROM pg_stat_user_tables
+          WHERE (seq_scan + idx_scan) > 0
+          ORDER BY n_live_tup DESC;
+        SQL
+      )
+    end
+
+    def execute_db_command(sql_command)
+      # TODO(josh): move pgbouncer naming logic here and in Create to a common location
+      tier = primary_instance.gsub("#{app}-", '')
+      matching_pods = Helpers.fetch_pods(app: app, filters: { tier: tier })
+      if matching_pods.empty?
+        puts 'Could not find pgbouncer pod to connect to'
+        exit 1
+      end
+      pod_name = matching_pods.first['metadata']['name']
+      exit 1 unless system("kubectl exec #{pod_name} --namespace #{app} -- psql -c \"#{sql_command}\"")
+    end
+
     def existing_instances
       `gcloud sql instances list --uri`.split("\n").map { |uri| uri.split('/').last }.select { |name| name.start_with? "#{app}-" }.map { |name| name.gsub(/^#{app}-/, '') }
     end

data/lib/seira/db/create.rb

@@ -194,7 +194,7 @@ module Seira
       end
 
       def pgbouncer_tier
-        name.gsub("handshake-", "")
+        name.gsub("#{app}-", "")
       end
 
       def default_database_name
@@ -203,6 +203,8 @@ module Seira
 
       def write_pgbouncer_yaml
         # TODO: Clean this up by moving into a proper templated yaml file
+        # TODO: Fix warning from cloudsql-proxy. We use context[:default_zone] for the DB Instance name
+        # which causes this error: got region "us-central1-c", want "us-central1".
         pgbouncer_yaml = <<-FOO
 ---
 apiVersion: v1
@@ -289,9 +291,6 @@ spec:
           ports:
             - containerPort: 5432
               protocol: TCP
-          envFrom:
-            - configMapRef:
-                name: cloudsql-configs
           volumeMounts:
             - name: cloudsql-credentials
               mountPath: /secrets/cloudsql

data/lib/seira/pods.rb

@@ -62,7 +62,7 @@ module Seira
 
     def run_connect
       # If a pod name is specified, connect to that pod; otherwise pick a random web pod
-      target_pod_name = pod_name || fetch_pods(app: app, tier: 'web').sample&.dig('metadata', 'name')
+      target_pod_name = pod_name || Helpers.fetch_pods(app: app, filters: { tier: 'web' }).sample&.dig('metadata', 'name')
 
       if target_pod_name
         connect_to_pod(target_pod_name)
@@ -104,7 +104,7 @@ module Seira
       command = args.join(' ')
 
       # Find a 'template' pod from the proper tier
-      template_pod = fetch_pods(app: app, tier: tier).first
+      template_pod = Helpers.fetch_pods(app: app, filters: { tier: tier }).first
       if template_pod.nil?
         puts "Unable to find #{tier} tier pod to copy config from"
         exit(1)
@@ -164,11 +164,6 @@ module Seira
       end
     end
 
-    def fetch_pods(filters)
-      filter_string = filters.map { |k, v| "#{k}=#{v}" }.join(',')
-      JSON.parse(`kubectl get pods --namespace=#{app} -o json --selector=#{filter_string}`)['items']
-    end
-
     def connect_to_pod(name, command = 'bash')
       puts "Connecting to #{name}..."
       system("kubectl exec -ti #{name} --namespace=#{app} -- #{command}")

data/lib/seira/setup.rb

@@ -18,7 +18,7 @@ module Seira
       ensure_software_installed
 
       if arg == 'all'
-        puts "We will now set up gcloud and kubectl for each project. We use a distinct GCP Project for each environment: #{ENVIRONMENTS.join(', ')}"
+        puts "We will now set up gcloud and kubectl for each project. We use a distinct GCP Project for each environment, which are specified in .seira.yml."
         settings.valid_cluster_names.each do |cluster|
           setup_cluster(cluster)
         end
@@ -26,7 +26,7 @@ module Seira
         puts "We will now set up gcloud and kubectl for #{arg}"
         setup_cluster(arg)
       else
-        puts "Please specify a valid cluster name or 'all'."
+        puts "Please specify a valid cluster name or 'all'. Got #{arg}"
         exit(1)
       end
 
@@ -51,20 +51,8 @@ module Seira
       end
 
       system("gcloud config configurations activate #{cluster_name}")
-
-      # TODO: Is this possible to automate?
-      # system("gcloud iam service-accounts create #{iam_user} --display-name=#{iam_user}")
-      # puts "Created service account:"
-      # system("gcloud iam service-accounts describe #{iam_user}@#{cluster_metadata['project']}.iam.gserviceaccount.com")
-      puts "First,"
-      puts "First, set up a service account in the #{cluster_metadata['project']} project and download the credentials for it. You may do so by accessing the below link. Save the file in a safe location."
-      puts "https://console.cloud.google.com/iam-admin/serviceaccounts/project?project=#{cluster_metadata['project']}&organizationId=#{settings.organization_id}"
-      puts "Then, set up an IAM user that it will inherit the permissions for."
-
-      puts "Please enter the path of your JSON key:"
-      filename = STDIN.gets
-      puts "Activating service account..."
-      system("gcloud auth activate-service-account --key-file #{filename}")
+      puts "Authenticating in order to set the auth for project #{cluster_name}. You will be directed to a google login page."
+      system("gcloud auth login")
       system("gcloud config set project #{cluster_metadata['project']}")
       system("gcloud config set compute/zone #{settings.default_zone}")
       puts "Your new gcloud setup for #{cluster_name}:"

data/lib/seira/version.rb

@@ -1,3 +1,3 @@
 module Seira
-  VERSION = "0.2.2".freeze
+  VERSION = "0.3.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: seira
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Scott Ringwelski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-02 00:00:00.000000000 Z
+date: 2018-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline