lds-cf-plugin 0.3.5 → 0.4.0

data/lib/lds-cf-plugin/app_dynamics_service.rb

@@ -0,0 +1,51 @@
+require "cf/cli"
+require "json"
+
+module LdsCfPlugin
+  class AppDynamicsService < CF::CLI
+    def precondition
+      check_target
+    end
+
+    desc "Create a App Dynamics Service"
+    group :lds, :services
+    input :name, :desc => "Name for your service", :argument => :optional
+
+    def create_app_dynamics_service
+      offerings = client.services
+      offerings.keep_if { |s| s.label == 'app-dynamics-service' && s.provider == 'ICS' }
+      service = offerings.first
+
+      if !service
+        fail "Cannot find App Dynamics service on #{client.target}"
+      end
+      
+      if service.version != "0.1"
+        fail "Your lds-cf-plugin version is out of date.  To update execute `gem update lds-cf-plugin`"
+      end
+
+      rest_client = CFoundry::RestClient.new(service.url, client.token)
+      rest_client.trace = client.trace
+
+      instance_name = input[:name]
+      if !instance_name
+        instance_name = ask("Name")
+      end
+
+      plan = service.service_plans.first
+
+      # Create service instance
+      instance = client.managed_service_instance
+      instance.name = instance_name
+
+      instance.service_plan = plan
+      instance.space = client.current_space
+
+      with_progress("Creating service #{c(instance.name, :name)}") do
+        instance.create!
+      end
+
+      instance
+    end
+  end
+end

data/lib/lds-cf-plugin/loggregator/client_config.rb

@@ -0,0 +1,14 @@
+module LogsCfPlugin
+  class ClientConfig
+    attr_reader :loggregator_host, :loggregator_port, :user_token, :output, :trace, :use_ssl
+
+    def initialize(loggregator_host, loggregator_port, user_token, output, trace, use_ssl = true)
+      @output = output
+      @loggregator_host = loggregator_host
+      @loggregator_port = loggregator_port
+      @user_token = user_token
+      @trace = trace
+      @use_ssl = use_ssl
+    end
+  end
+end

data/lib/lds-cf-plugin/loggregator/log_message.pb.rb

@@ -0,0 +1,31 @@
+## Generated from log_message.proto for logmessage
+require "beefcake"
+
+
+class LogMessage
+  include Beefcake::Message
+
+  module MessageType
+    OUT = 1
+    ERR = 2
+  end
+
+  required :message, :bytes, 1
+  required :message_type, LogMessage::MessageType, 2
+  required :timestamp, :sint64, 3
+  required :app_id, :string, 4
+  optional :source_id, :string, 6
+  repeated :drain_urls, :string, 7
+  optional :source_name, :string, 8
+
+end
+
+class LogEnvelope
+  include Beefcake::Message
+
+
+  required :routing_key, :string, 1
+  required :signature, :bytes, 2
+  required :log_message, LogMessage, 3
+
+end

data/lib/lds-cf-plugin/loggregator/log_message.proto

@@ -0,0 +1,22 @@
+package logmessage;
+
+message LogMessage {
+    enum MessageType {
+        OUT = 1;
+        ERR = 2;
+    }
+
+    required bytes message = 1;
+    required MessageType message_type = 2;
+    required sint64 timestamp = 3;
+    required string app_id = 4;
+    optional string source_id = 6;
+    repeated string drain_urls = 7;
+    optional string source_name = 8;
+}
+
+message LogEnvelope {
+    required string routing_key = 1;
+    required bytes signature = 2;
+    required LogMessage log_message = 3;
+}

data/lib/lds-cf-plugin/loggregator/log_message_extender.rb

@@ -0,0 +1,15 @@
+class LogMessage
+  def message_type_name
+    {MessageType::OUT => "OUT", MessageType::ERR => "ERR"}[message_type]
+  end
+
+  def time=(time)
+    self.timestamp = (time.tv_sec * 1000000000) + time.tv_nsec
+  end
+
+  def time
+    num_secs = @timestamp / 1000000000
+    fractional_usecs = (@timestamp % 1000000000).to_f / 1000
+    Time.at(num_secs, fractional_usecs)
+  end
+end

data/lib/lds-cf-plugin/loggregator/logs.rb

@@ -0,0 +1,44 @@
+require 'cf'
+require 'eventmachine'
+require 'faye/websocket'
+require 'uri'
+
+module LogsCfPlugin
+  require 'lds-cf-plugin/loggregator/message_writer'
+  require 'lds-cf-plugin/loggregator/client_config'
+  require 'lds-cf-plugin/loggregator/tailling_logs_client'
+
+  class Plugin < CF::CLI
+    include LoginRequirements
+    include MessageWriter
+
+    desc "Tail or dump logs for CF applications"
+    group :lds, :diagnostics
+    input :app, :desc => "App to tail logs from", :argument => :optional, :from_given => by_name(:app)
+    input :recent, :type => :boolean, :desc => "Dump recent logs instead of tailing", :default => false
+
+    def logs
+      client.current_organization.name # resolve org name so CC will validate AuthToken
+
+      unless input[:app]
+        Mothership::Help.command_help(@@commands[:logs])
+        fail "Please provide an application to log."
+      end
+      port = input[:recent] ? nil : 4443
+      client_config = ClientConfig.new(loggregator_host, port, client.token.auth_header, STDOUT, input[:trace], use_ssl)
+
+      TailingLogsClient.new(client_config).logs_for(input[:app], input[:recent])
+    end
+
+    private
+
+    def loggregator_host
+      target_base = client.target.sub(/^https?:\/\/([^\.]+\.)?(.+)\/?/, '\2')
+      "loggregator.#{target_base}"
+    end
+
+    def use_ssl
+      client.target.start_with?('https')
+    end
+  end
+end

data/lib/lds-cf-plugin/loggregator/message_writer.rb

@@ -0,0 +1,18 @@
+require "cf/cli"
+require "lds-cf-plugin/loggregator/log_message_extender"
+
+module MessageWriter
+  include CF::Interactive
+
+  def write(app, output, message)
+    msg = [format_time(message.time), "#{message.source_name}/#{message.source_id}", message.message_type_name, message.message].join(" ")
+    msg = c(msg.chomp, :error) if message.message_type == LogMessage::MessageType::ERR
+    output.puts(msg)
+  end
+
+  private
+
+  def format_time(time)
+    time.strftime("%b %d %H:%M:%S.%3N")
+  end
+end

data/lib/lds-cf-plugin/loggregator/tailling_logs_client.rb

@@ -0,0 +1,101 @@
+require "lds-cf-plugin/loggregator/log_message.pb"
+require "lds-cf-plugin/loggregator/log_message_extender"
+
+module LogsCfPlugin
+  class TailingLogsClient
+    #include CFoundry::TraceHelpers
+    include MessageWriter
+
+    def initialize(config)
+      @config = config
+    end
+
+    def logs_for(app, recent)
+      protocol = use_ssl ? "wss" : "ws"
+      websocket_address = "#{protocol}://#{loggregator_host}#{loggregator_port ? ":#{loggregator_port}" : ""}/#{recent ? 'dump' : 'tail'}/?app=#{app.guid}"
+
+      output.puts "websocket_address: #{websocket_address}" if trace
+
+      make_websocket_request(app, websocket_address)
+    end
+
+    def make_websocket_request(app, websocket_address)
+      redirect_uri = nil
+      @em_client_thread = Thread.new do
+        EM.run {
+          ws = Faye::WebSocket::Client.new(websocket_address, nil, :headers => {"Origin" => "http://localhost", "Authorization" => user_token})
+          ws.on :open do |event|
+            output.puts("Connected to server.")
+            EventMachine.add_periodic_timer(keep_alive_interval) do
+              ws.send("I'm alive!")
+            end
+          end
+
+          ws.on :message do |event|
+            begin
+              received_message = LogMessage.decode(event.data.pack("C*"))
+              write(app, output, received_message)
+            rescue Exception => e
+              output.puts e.message
+              output.puts e.backtrace
+              output.puts("Error parsing loggregator data. Please make sure you have the latest lds-cf-plugin.")
+              ws.close
+            end
+          end
+
+          ws.on :error do |event|
+            if !redirect_uri
+              if event.current_target.status == 302
+                redirect_uri = event.current_target.headers["location"]
+                ws.close
+                @em_client_thread.kill
+                ws = nil
+              else
+                output.puts("Server error: #{websocket_address}")
+                output.puts(event.data.inspect) if trace
+              end
+            end
+          end
+
+          ws.on :close do |event|
+            unless redirect_uri
+              ws.close
+              case event.code
+                when 4000
+                  output.puts("Error: No space given.")
+                when 4001
+                  output.puts("Error: No authorization token given.")
+                when 4002
+                  output.puts("Error: Not authorized.")
+              end
+              output.puts("Server connection closed.")
+              @em_client_thread.kill
+              ws = nil
+            end
+          end
+        }
+      end
+
+      wait_for_em_thread_to_finish
+
+      make_websocket_request(app, redirect_uri) if redirect_uri
+    end
+
+    def wait_for_em_thread_to_finish
+      while @em_client_thread.alive? do
+        sleep 0.1
+      end
+    end
+
+    private
+
+    attr_reader :config
+
+    delegate :output, :loggregator_host, :loggregator_port, :user_token, :trace, :use_ssl,
+             to: :config
+
+    def keep_alive_interval
+      25
+    end
+  end
+end

data/lib/lds-cf-plugin/plugin.rb

@@ -6,6 +6,7 @@ Mothership::Help.groups(
     [:diagnostics, "Diagnostics"]]
 )
 
+require "lds-cf-plugin/app_dynamics_service"
 require "lds-cf-plugin/custom_service"
 require "lds-cf-plugin/oracle_service"
 require "lds-cf-plugin/lds_account_service"
@@ -14,3 +15,4 @@ require "lds-cf-plugin/wam_service"
 require "lds-cf-plugin/servicemanager_service"
 require "lds-cf-plugin/marklogic_service"
 require "lds-cf-plugin/tunnel"
+require "lds-cf-plugin/loggregator/logs"

data/lib/lds-cf-plugin/servicemanager_service.rb

@@ -80,7 +80,7 @@ module LdsCfPlugin
       end
 
       prexisting = input[:prexisting]
-      prexisting = ask("Use existing Service Manager application CI for '#{sm_app_name}'?", :default => true) if !prexisting
+      prexisting = ask("Use existing Service Manager CI for '#{sm_app_name} - #{env}'?", :default => true) if !prexisting
 
       if prexisting 
       payload = {
@@ -137,7 +137,8 @@ module LdsCfPlugin
           :SuuportContactReason => "Primary Contact",
           :PortfolioId => portfolioId,
           :RegStandards => "None",
-          :SystemRiskLevel => "Low Risk"
+          :SystemRiskLevel => "Low Risk",
+          :prexisting => false
       }
       end 
 

data/lib/lds-cf-plugin/version.rb

@@ -1,3 +1,3 @@
 module LdsCfPlugin
-  VERSION = "0.3.5".freeze
+  VERSION = "0.4.0".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lds-cf-plugin
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-06 00:00:00.000000000 Z
+date: 2014-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cf
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.4.4
+        version: 5.4.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.4.4
+        version: 5.4.5
 - !ruby/object:Gem::Dependency
   name: eventmachine
   requirement: !ruby/object:Gem::Requirement
@@ -59,6 +59,38 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.6'
+- !ruby/object:Gem::Dependency
+  name: beefcake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.3.7
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.3.7
+- !ruby/object:Gem::Dependency
+  name: faye-websocket
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.6.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.6.1
 description: 
 email:
 - heathma@ldschurch.org
@@ -75,10 +107,18 @@ files:
 - lib/lds-cf-plugin/tunnel.rb
 - lib/lds-cf-plugin/version.rb
 - lib/lds-cf-plugin/plugin.rb
+- lib/lds-cf-plugin/app_dynamics_service.rb
+- lib/lds-cf-plugin/loggregator/log_message_extender.rb
+- lib/lds-cf-plugin/loggregator/tailling_logs_client.rb
+- lib/lds-cf-plugin/loggregator/client_config.rb
+- lib/lds-cf-plugin/loggregator/log_message.pb.rb
+- lib/lds-cf-plugin/loggregator/message_writer.rb
+- lib/lds-cf-plugin/loggregator/logs.rb
+- lib/lds-cf-plugin/loggregator/log_message.proto
 - lib/lds-cf-plugin/tunnel/tunnelclient.rb
 - lib/lds-cf-plugin/wam_service.rb
 - lib/lds-cf-plugin/servicemanager_service.rb
-homepage: http://ui.app.lds.org/
+homepage: https://cf.lds.org/
 licenses: []
 post_install_message: 
 rdoc_options: []