upguard 0.0.6 → 0.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: a48de6f627011308b5e15643cf59434dc4a5165a
-  data.tar.gz: fe28ac17cb16733dfa0770a32b828f00080ba490
+SHA256:
+  metadata.gz: 1130831c374a901bdfae30e7ca82ef2b5911753192f464bf80adeb3bfbfb12e1
+  data.tar.gz: d7c726622dddf3b5a262db3a361557857f0d25354494194c8ea0224a3234b067
 SHA512:
-  metadata.gz: 7539d483e269ef662af049a551144768d28dfbc2fa3a3a1c59ae3ae28ec38a6af0c9cec9a3134fb7267fab45d667a046b1ae9aa36e54b0f19f09298e589f31f0
-  data.tar.gz: fd669c2bc3a8897092cfc8aef5c913f1af4976c1756739eb12d47e7e8a594e523b2d1f27daf75b498e647f3e5162dfe476ef314d59f6910b9edcad64dc907539
+  metadata.gz: 53166ffbfa4ea2f490da92e0a6d21ae876214e507c3d5dfad7f8de1bff6a66466cc67460366bfe47cb1f65c5fc235692fe281ffd57f6a86cb74a683149f2bdc4
+  data.tar.gz: 8ac4b765ddd3f27ebdebb142755da298b09b62a58749f1bb4786ccd8b1fa20425934a8eafaf45573310c890207deac439fd76faef7187cd98534efc0b9169326

data/lib/upguard.rb

@@ -1,12 +1,18 @@
 require_relative 'upguard/BaseObject'
+require_relative 'upguard/Version'
 require_relative 'upguard/Account'
+require_relative 'upguard/ChangeRequest'
+require_relative 'upguard/ChangeRequestList'
 require_relative 'upguard/ConnectionManager'
 require_relative 'upguard/ConnectionManagerList'
 require_relative 'upguard/ConnectionManagerGroup'
 require_relative 'upguard/ConnectionManagerGroupList'
 require_relative 'upguard/Environment'
 require_relative 'upguard/EnvironmentList'
+require_relative 'upguard/ExternalEvent'
 require_relative 'upguard/Event'
+require_relative 'upguard/EventList'
+require_relative 'upguard/EventVariables'
 require_relative 'upguard/EventAction'
 require_relative 'upguard/EventActionList'
 require_relative 'upguard/Incident'
@@ -18,11 +24,18 @@ require_relative 'upguard/Node'
 require_relative 'upguard/NodeList'
 require_relative 'upguard/NodeGroup'
 require_relative 'upguard/NodeGroupList'
+require_relative 'upguard/NodeGroupUser'
+require_relative 'upguard/NodeGroupUserList'
+require_relative 'upguard/NodeMediumInfo'
+require_relative 'upguard/NodeScan'
+require_relative 'upguard/NodeScanList'
 require_relative 'upguard/NodeType'
 require_relative 'upguard/OperatingSystem'
 require_relative 'upguard/OperatingSystemList'
 require_relative 'upguard/OperatingSystemFamily'
 require_relative 'upguard/OperatingSystemFamilyList'
+require_relative 'upguard/Pluggable'
+require_relative 'upguard/PluggableList'
 require_relative 'upguard/Policy'
 require_relative 'upguard/PolicyList'
 require_relative 'upguard/ScheduledJob'

data/lib/upguard/Account.rb

@@ -2,6 +2,12 @@ module UpGuard
   class Account < BaseObject
     attr_accessor :id
     attr_accessor :name
+    def initialize(appliance_url, appliance_api_key, sec_key, insecure = false)
+      super(appliance_url, appliance_api_key, sec_key, insecure)
+      self.id = nil
+      self.name = nil
+    end
+
     def from_hash(h)
       self.id = h['id'] if h.include?('id')
       self.name = h['name'] if h.include?('name')
@@ -19,7 +25,7 @@ module UpGuard
     
     def change_request_by_id(id)
       obj = http_get("/api/v2/change_requests/#{id}.json")
-      elem = ChangeRequest.new(self.appliance_url, self.api_key, self.sec_key, self.insecure)
+      elem = ChangeRequest.new(self.appliance_url, self.appliance_api_key, self.sec_key, self.insecure)
         elem.external_id = obj["external_id"]
         elem.id = obj["id"]
         elem.planned_end_date = obj["planned_end_date"]
@@ -33,9 +39,9 @@ module UpGuard
     
     def change_requests
       obj = http_get("/api/v2/change_requests.json")
-      the_list = ChangeRequestList.new(self.appliance_url, self.api_key, self.sec_key, self.insecure)
+      the_list = ChangeRequestList.new(self.appliance_url, self.appliance_api_key, self.sec_key, self.insecure)
       obj.each do |x|
-        elem = ChangeRequest.new(self.appliance_url, self.api_key, self.sec_key, self.insecure)
+        elem = ChangeRequest.new(self.appliance_url, self.appliance_api_key, self.sec_key, self.insecure)
         elem.external_id = x["external_id"] if x.include?("external_id")
         elem.id = x["id"] if x.include?("id")
         elem.planned_end_date = x["planned_end_date"] if x.include?("planned_end_date")
@@ -48,17 +54,24 @@ module UpGuard
       return the_list
     end
 
+    def new_connection_manager_group
+      return ConnectionManagerGroup.new(self.appliance_url, self.appliance_api_key, self.sec_key, self.insecure)
+    end
+
     
     def connection_managers
       obj = http_get("/api/v2/connection_managers.json")
-      the_list = ConnectionManagerList.new(self.appliance_url, self.api_key, self.sec_key, self.insecure)
+      the_list = ConnectionManagerList.new(self.appliance_url, self.appliance_api_key, self.sec_key, self.insecure)
       obj.each do |x|
-        elem = ConnectionManager.new(self.appliance_url, self.api_key, self.sec_key, self.insecure)
+        elem = ConnectionManager.new(self.appliance_url, self.appliance_api_key, self.sec_key, self.insecure)
+        elem.agent_version = x["agent_version"] if x.include?("agent_version")
+        elem.agent_type = x["agent_type"] if x.include?("agent_type")
         elem.channels = x["channels"] if x.include?("channels")
         elem.connection_manager_group_id = x["connection_manager_group_id"] if x.include?("connection_manager_group_id")
         elem.created_at = x["created_at"] if x.include?("created_at")
         elem.hostname = x["hostname"] if x.include?("hostname")
         elem.id = x["id"] if x.include?("id")
+        elem.ip_address = x["ip_address"] if x.include?("ip_address")
         elem.last_contact = x["last_contact"] if x.include?("last_contact")
         elem.stats = x["stats"] if x.include?("stats")
         elem.updated_at = x["updated_at"] if x.include?("updated_at")
@@ -70,12 +83,12 @@ module UpGuard
     
     def connection_manager_groups
       obj = http_get("/api/v2/connection_manager_groups.json")
-      the_list = ConnectionManagerGroupList.new(self.appliance_url, self.api_key, self.sec_key, self.insecure)
+      the_list = ConnectionManagerGroupList.new(self.appliance_url, self.appliance_api_key, self.sec_key, self.insecure)
       obj.each do |x|
-        elem = ConnectionManagerGroup.new(self.appliance_url, self.api_key, self.sec_key, self.insecure)
+        elem = ConnectionManagerGroup.new(self.appliance_url, self.appliance_api_key, self.sec_key, self.insecure)
         elem.id = x["id"] if x.include?("id")
         elem.name = x["name"] if x.include?("name")
-        elem.organisation_id = x["organisation_id"] if x.include?("organisation_id")
+        elem.api_key = x["api_key"] if x.include?("api_key")
         elem.status = x["status"] if x.include?("status")
         the_list << elem
       end
@@ -83,13 +96,13 @@ module UpGuard
     end
 
     def new_environment
-      return Environment.new(self.appliance_url, self.api_key, self.sec_key, self.insecure)
+      return Environment.new(self.appliance_url, self.appliance_api_key, self.sec_key, self.insecure)
     end
 
     
     def environment_by_id(id)
       obj = http_get("/api/v2/environments/#{id}.json")
-      elem = Environment.new(self.appliance_url, self.api_key, self.sec_key, self.insecure)
+      elem = Environment.new(self.appliance_url, self.appliance_api_key, self.sec_key, self.insecure)
         elem.id = obj["id"]
         elem.name = obj["name"]
       return elem
@@ -98,9 +111,9 @@ module UpGuard
     
     def environments
       obj = http_get("/api/v2/environments.json")
-      the_list = EnvironmentList.new(self.appliance_url, self.api_key, self.sec_key, self.insecure)
+      the_list = EnvironmentList.new(self.appliance_url, self.appliance_api_key, self.sec_key, self.insecure)
       obj.each do |x|
-        elem = Environment.new(self.appliance_url, self.api_key, self.sec_key, self.insecure)
+        elem = Environment.new(self.appliance_url, self.appliance_api_key, self.sec_key, self.insecure)
         elem.description = x["description"] if x.include?("description")
         elem.id = x["id"] if x.include?("id")
         elem.name = x["name"] if x.include?("name")
@@ -111,12 +124,16 @@ module UpGuard
       return the_list
     end
 
+    def new_external_event
+      return ExternalEvent.new(self.appliance_url, self.appliance_api_key, self.sec_key, self.insecure)
+    end
+
     def events_with_view_name(view_name)
-    url = "/api/v2/events.json?view_name=#{view_name}"
+      url = "/api/v2/events.json?view_name=#{view_name}"
       obj = http_get(url)
-      the_list = []
+      the_list = EventList.new(self.appliance_url, self.appliance_api_key, self.sec_key, self.insecure)
       obj.each do |x|
-        elem = Event.new(self.appliance_url, self.api_key, self.sec_key, self.insecure)
+        elem = Event.new(self.appliance_url, self.appliance_api_key, self.sec_key, self.insecure)
         elem.id = x["id"]
         elem.type_id = x["type_id"]
         elem.environment_id = x["environment_id"]
@@ -127,11 +144,11 @@ module UpGuard
     end
 
     def events_with_query(query)
-    url = "/api/v2/events.json?query=#{query}"
+      url = "/api/v2/events.json?query=#{query}"
       obj = http_get(url)
-      the_list = []
+      the_list = EventList.new(self.appliance_url, self.appliance_api_key, self.sec_key, self.insecure)
       obj.each do |x|
-        elem = Event.new(self.appliance_url, self.api_key, self.sec_key, self.insecure)
+        elem = Event.new(self.appliance_url, self.appliance_api_key, self.sec_key, self.insecure)
         elem.id = x["id"]
         elem.type_id = x["type_id"]
         elem.environment_id = x["environment_id"]
@@ -144,7 +161,7 @@ module UpGuard
     
     def event_action_by_id(id)
       obj = http_get("/api/v2/event_actions/#{id}.json")
-      elem = EventAction.new(self.appliance_url, self.api_key, self.sec_key, self.insecure)
+      elem = EventAction.new(self.appliance_url, self.appliance_api_key, self.sec_key, self.insecure)
         elem.id = obj["id"]
         elem.name = obj["name"]
       return elem
@@ -153,9 +170,9 @@ module UpGuard
     
     def event_types
       obj = http_get("/api/v2/events/types.json")
-      the_list = EventTypeList.new(self.appliance_url, self.api_key, self.sec_key, self.insecure)
+      the_list = EventTypeList.new(self.appliance_url, self.appliance_api_key, self.sec_key, self.insecure)
       obj.each do |x|
-        elem = EventType.new(self.appliance_url, self.api_key, self.sec_key, self.insecure)
+        elem = EventType.new(self.appliance_url, self.appliance_api_key, self.sec_key, self.insecure)
         elem.id = x["id"] if x.include?("id")
         elem.name = x["name"] if x.include?("name")
         the_list << elem
@@ -166,9 +183,9 @@ module UpGuard
     
     def event_actions
       obj = http_get("/api/v2/event_actions.json")
-      the_list = EventActionList.new(self.appliance_url, self.api_key, self.sec_key, self.insecure)
+      the_list = EventActionList.new(self.appliance_url, self.appliance_api_key, self.sec_key, self.insecure)
       obj.each do |x|
-        elem = EventAction.new(self.appliance_url, self.api_key, self.sec_key, self.insecure)
+        elem = EventAction.new(self.appliance_url, self.appliance_api_key, self.sec_key, self.insecure)
         elem.id = x["id"] if x.include?("id")
         elem.name = x["name"] if x.include?("name")
         elem.status = x["status"] if x.include?("status")
@@ -183,9 +200,9 @@ module UpGuard
     
     def incidents
       obj = http_get("/api/v2/incidents.json")
-      the_list = IncidentList.new(self.appliance_url, self.api_key, self.sec_key, self.insecure)
+      the_list = IncidentList.new(self.appliance_url, self.appliance_api_key, self.sec_key, self.insecure)
       obj.each do |x|
-        elem = Incident.new(self.appliance_url, self.api_key, self.sec_key, self.insecure)
+        elem = Incident.new(self.appliance_url, self.appliance_api_key, self.sec_key, self.insecure)
         elem.id = x["id"] if x.include?("id")
         elem.external_id = x["external_id"] if x.include?("external_id")
         elem.short_description = x["short_description"] if x.include?("short_description")
@@ -198,13 +215,25 @@ module UpGuard
     end
 
     
+    def incident_by_id(id)
+      obj = http_get("/api/v2/incidents/#{id}.json")
+      elem = Incident.new(self.appliance_url, self.appliance_api_key, self.sec_key, self.insecure)
+        elem.id = obj["id"]
+        elem.external_id = obj["external_id"]
+        elem.short_description = obj["short_description"]
+        elem.started_at = obj["started_at"]
+        elem.ended_at = obj["ended_at"]
+        elem.url = obj["url"]
+      return elem
+    end
+
+    
     def jobs
       obj = http_get("/api/v2/jobs.json")
-      the_list = JobList.new(self.appliance_url, self.api_key, self.sec_key, self.insecure)
+      the_list = JobList.new(self.appliance_url, self.appliance_api_key, self.sec_key, self.insecure)
       obj.each do |x|
-        elem = Job.new(self.appliance_url, self.api_key, self.sec_key, self.insecure)
+        elem = Job.new(self.appliance_url, self.appliance_api_key, self.sec_key, self.insecure)
         elem.id = x["id"] if x.include?("id")
-        elem.organisation_id = x["organisation_id"] if x.include?("organisation_id")
         elem.source_id = x["source_id"] if x.include?("source_id")
         elem.source_name = x["source_name"] if x.include?("source_name")
         elem.source_type = x["source_type"] if x.include?("source_type")
@@ -214,28 +243,47 @@ module UpGuard
       return the_list
     end
 
+    
+    def job_by_id(id)
+      obj = http_get("/api/v2/jobs/#{id}.json")
+      elem = Job.new(self.appliance_url, self.appliance_api_key, self.sec_key, self.insecure)
+        elem.id = obj["id"]
+        elem.source_id = obj["source_id"]
+        elem.source_name = obj["source_name"]
+        elem.source_type = obj["source_type"]
+        elem.status = obj["status"]
+      return elem
+    end
+
     def new_node
-      return Node.new(self.appliance_url, self.api_key, self.sec_key, self.insecure)
+      return Node.new(self.appliance_url, self.appliance_api_key, self.sec_key, self.insecure)
     end
 
     
     def nodes
       obj = http_get("/api/v2/nodes.json")
-      the_list = NodeList.new(self.appliance_url, self.api_key, self.sec_key, self.insecure)
+      the_list = NodeList.new(self.appliance_url, self.appliance_api_key, self.sec_key, self.insecure)
       obj.each do |x|
-        elem = Node.new(self.appliance_url, self.api_key, self.sec_key, self.insecure)
+        elem = Node.new(self.appliance_url, self.appliance_api_key, self.sec_key, self.insecure)
+        elem.connection_manager_group_id = x["connection_manager_group_id"] if x.include?("connection_manager_group_id")
         elem.external_id = x["external_id"] if x.include?("external_id")
         elem.environment_id = x["environment_id"] if x.include?("environment_id")
         elem.id = x["id"] if x.include?("id")
+        elem.ip_address = x["ip_address"] if x.include?("ip_address")
         elem.last_scan_status = x["last_scan_status"] if x.include?("last_scan_status")
         elem.last_scan_status_string = x["last_scan_status_string"] if x.include?("last_scan_status_string")
         elem.mac_address = x["mac_address"] if x.include?("mac_address")
+        elem.medium_hostname = x["medium_hostname"] if x.include?("medium_hostname")
+        elem.medium_port = x["medium_port"] if x.include?("medium_port")
+        elem.medium_type = x["medium_type"] if x.include?("medium_type")
+        elem.medium_username = x["medium_username"] if x.include?("medium_username")
         elem.name = x["name"] if x.include?("name")
         elem.node_type = x["node_type"] if x.include?("node_type")
         elem.online = x["online"] if x.include?("online")
         elem.operating_system_family_id = x["operating_system_family_id"] if x.include?("operating_system_family_id")
         elem.operating_system_id = x["operating_system_id"] if x.include?("operating_system_id")
         elem.short_description = x["short_description"] if x.include?("short_description")
+        elem.medium_info.from_hash(x["medium_info"]) if x.include?("medium_info")
         the_list << elem
       end
       return the_list
@@ -245,7 +293,7 @@ module UpGuard
       url = "/api/v2/nodes/lookup.json?external_id=#{external_id}"
       obj = http_get(url)
       id = obj["node_id"]
-      elem = Node.new(self.appliance_url, self.api_key, self.sec_key, self.insecure)
+      elem = Node.new(self.appliance_url, self.appliance_api_key, self.sec_key, self.insecure)
       elem.id = id
       elem.load
       return elem
@@ -255,7 +303,7 @@ module UpGuard
       url = "/api/v2/nodes/lookup.json?name=#{name}"
       obj = http_get(url)
       id = obj["node_id"]
-      elem = Node.new(self.appliance_url, self.api_key, self.sec_key, self.insecure)
+      elem = Node.new(self.appliance_url, self.appliance_api_key, self.sec_key, self.insecure)
       elem.id = id
       elem.load
       return elem
@@ -264,18 +312,22 @@ module UpGuard
     
     def node_by_id(id)
       obj = http_get("/api/v2/nodes/#{id}.json")
-      elem = Node.new(self.appliance_url, self.api_key, self.sec_key, self.insecure)
+      elem = Node.new(self.appliance_url, self.appliance_api_key, self.sec_key, self.insecure)
         elem.id = obj["id"]
         elem.name = obj["name"]
       return elem
     end
 
+    def new_node_group
+      return NodeGroup.new(self.appliance_url, self.appliance_api_key, self.sec_key, self.insecure)
+    end
+
     
     def node_groups
       obj = http_get("/api/v2/node_groups.json")
-      the_list = NodeGroupList.new(self.appliance_url, self.api_key, self.sec_key, self.insecure)
+      the_list = NodeGroupList.new(self.appliance_url, self.appliance_api_key, self.sec_key, self.insecure)
       obj.each do |x|
-        elem = NodeGroup.new(self.appliance_url, self.api_key, self.sec_key, self.insecure)
+        elem = NodeGroup.new(self.appliance_url, self.appliance_api_key, self.sec_key, self.insecure)
         elem.description = x["description"] if x.include?("description")
         elem.id = x["id"] if x.include?("id")
         elem.name = x["name"] if x.include?("name")
@@ -287,11 +339,48 @@ module UpGuard
     end
 
     
+    def node_group_by_id(id)
+      obj = http_get("/api/v2/node_groups/#{id}.json")
+      elem = NodeGroup.new(self.appliance_url, self.appliance_api_key, self.sec_key, self.insecure)
+        elem.id = obj["id"]
+        elem.name = obj["name"]
+      return elem
+    end
+
+    def node_group_by_name(name)
+      url = "/api/v2/node_groups/lookup.json?name=#{name}"
+      obj = http_get(url)
+      id = obj["node_group_id"]
+      elem = NodeGroup.new(self.appliance_url, self.appliance_api_key, self.sec_key, self.insecure)
+      elem.id = id
+      elem.load
+      return elem
+    end
+
+    
+    def node_scan_by_id(id)
+      obj = http_get("/api/v2/node_scans/#{id}.json")
+      elem = NodeScan.new(self.appliance_url, self.appliance_api_key, self.sec_key, self.insecure)
+        elem.id = obj["id"]
+        elem.node_id = obj["node_id"]
+        elem.data = obj["data"]
+        elem.scan_options = obj["scan_options"]
+        elem.created_at = obj["created_at"]
+        elem.updated_at = obj["updated_at"]
+        elem.task_id = obj["task_id"]
+        elem.associated_id = obj["associated_id"]
+        elem.category = obj["category"]
+        elem.label = obj["label"]
+        elem.tsv = obj["tsv"]
+      return elem
+    end
+
+    
     def operating_system_families
       obj = http_get("/api/v2/operating_system_families.json")
-      the_list = OperatingSystemFamilyList.new(self.appliance_url, self.api_key, self.sec_key, self.insecure)
+      the_list = OperatingSystemFamilyList.new(self.appliance_url, self.appliance_api_key, self.sec_key, self.insecure)
       obj.each do |x|
-        elem = OperatingSystemFamily.new(self.appliance_url, self.api_key, self.sec_key, self.insecure)
+        elem = OperatingSystemFamily.new(self.appliance_url, self.appliance_api_key, self.sec_key, self.insecure)
         elem.id = x["id"] if x.include?("id")
         elem.name = x["name"] if x.include?("name")
         the_list << elem
@@ -302,9 +391,9 @@ module UpGuard
     
     def operating_systems
       obj = http_get("/api/v2/operating_systems.json")
-      the_list = OperatingSystemList.new(self.appliance_url, self.api_key, self.sec_key, self.insecure)
+      the_list = OperatingSystemList.new(self.appliance_url, self.appliance_api_key, self.sec_key, self.insecure)
       obj.each do |x|
-        elem = OperatingSystem.new(self.appliance_url, self.api_key, self.sec_key, self.insecure)
+        elem = OperatingSystem.new(self.appliance_url, self.appliance_api_key, self.sec_key, self.insecure)
         elem.id = x["id"] if x.include?("id")
         elem.name = x["name"] if x.include?("name")
         elem.operating_system_family_id = x["operating_system_family_id"] if x.include?("operating_system_family_id")
@@ -314,14 +403,41 @@ module UpGuard
       return the_list
     end
 
+    def new_pluggable
+      return Pluggable.new(self.appliance_url, self.appliance_api_key, self.sec_key, self.insecure)
+    end
+
+    
+    def pluggables
+      obj = http_get("/api/v2/pluggables.json")
+      the_list = PluggableList.new(self.appliance_url, self.appliance_api_key, self.sec_key, self.insecure)
+      obj.each do |x|
+        elem = Pluggable.new(self.appliance_url, self.appliance_api_key, self.sec_key, self.insecure)
+        elem.description = x["description"] if x.include?("description")
+        elem.id = x["id"] if x.include?("id")
+        elem.name = x["name"] if x.include?("name")
+        elem.operating_system_family = x["operating_system_family"] if x.include?("operating_system_family")
+        elem.operating_system_family_id = x["operating_system_family_id"] if x.include?("operating_system_family_id")
+        elem.script = x["script"] if x.include?("script")
+        the_list << elem
+      end
+      return the_list
+    end
+
+    def new_policy
+      return Policy.new(self.appliance_url, self.appliance_api_key, self.sec_key, self.insecure)
+    end
+
     
     def policies
       obj = http_get("/api/v2/policies.json")
-      the_list = PolicyList.new(self.appliance_url, self.api_key, self.sec_key, self.insecure)
+      the_list = PolicyList.new(self.appliance_url, self.appliance_api_key, self.sec_key, self.insecure)
       obj.each do |x|
-        elem = Policy.new(self.appliance_url, self.api_key, self.sec_key, self.insecure)
+        elem = Policy.new(self.appliance_url, self.appliance_api_key, self.sec_key, self.insecure)
+        elem.description = x["description"] if x.include?("description")
         elem.id = x["id"] if x.include?("id")
         elem.name = x["name"] if x.include?("name")
+        elem.short_description = x["short_description"] if x.include?("short_description")
         the_list << elem
       end
       return the_list
@@ -330,9 +446,9 @@ module UpGuard
     
     def scheduled_jobs
       obj = http_get("/api/v2/scheduled_jobs.json")
-      the_list = ScheduledJobList.new(self.appliance_url, self.api_key, self.sec_key, self.insecure)
+      the_list = ScheduledJobList.new(self.appliance_url, self.appliance_api_key, self.sec_key, self.insecure)
       obj.each do |x|
-        elem = ScheduledJob.new(self.appliance_url, self.api_key, self.sec_key, self.insecure)
+        elem = ScheduledJob.new(self.appliance_url, self.appliance_api_key, self.sec_key, self.insecure)
         elem.data = x["data"] if x.include?("data")
         elem.id = x["id"] if x.include?("id")
         elem.source_id = x["source_id"] if x.include?("source_id")
@@ -347,9 +463,9 @@ module UpGuard
     
     def system_metrics
       obj = http_get("/api/v2/system_metrics.json")
-      the_list = SystemMetricList.new(self.appliance_url, self.api_key, self.sec_key, self.insecure)
+      the_list = SystemMetricList.new(self.appliance_url, self.appliance_api_key, self.sec_key, self.insecure)
       obj.each do |x|
-        elem = SystemMetric.new(self.appliance_url, self.api_key, self.sec_key, self.insecure)
+        elem = SystemMetric.new(self.appliance_url, self.appliance_api_key, self.sec_key, self.insecure)
         elem.metric = x["metric"] if x.include?("metric")
         elem.value = x["value"] if x.include?("value")
         elem.timestamp = x["timestamp"] if x.include?("timestamp")
@@ -361,7 +477,7 @@ module UpGuard
     
     def text_file_by_id(id)
       obj = http_get("/api/v2/text_files/#{id}.json")
-      elem = TextFile.new(self.appliance_url, self.api_key, self.sec_key, self.insecure)
+      elem = TextFile.new(self.appliance_url, self.appliance_api_key, self.sec_key, self.insecure)
         elem.category = obj["category"]
         elem.checksum = obj["checksum"]
         elem.created_at = obj["created_at"]
@@ -375,15 +491,36 @@ module UpGuard
     
     def users
       obj = http_get("/api/v2/users.json")
-      the_list = UserList.new(self.appliance_url, self.api_key, self.sec_key, self.insecure)
+      the_list = UserList.new(self.appliance_url, self.appliance_api_key, self.sec_key, self.insecure)
       obj.each do |x|
-        elem = User.new(self.appliance_url, self.api_key, self.sec_key, self.insecure)
+        elem = User.new(self.appliance_url, self.appliance_api_key, self.sec_key, self.insecure)
         elem.email = x["email"] if x.include?("email")
         elem.id = x["id"] if x.include?("id")
         elem.last_sign_in_at = x["last_sign_in_at"] if x.include?("last_sign_in_at")
         elem.name = x["name"] if x.include?("name")
         elem.role = x["role"] if x.include?("role")
         elem.surname = x["surname"] if x.include?("surname")
+        elem.external_id = x["external_id"] if x.include?("external_id")
+        the_list << elem
+      end
+      return the_list
+    end
+
+    
+    def users_and_invitees
+      obj = http_get("/api/v2/users.json?invited=true")
+      the_list = UserList.new(self.appliance_url, self.appliance_api_key, self.sec_key, self.insecure)
+      obj.each do |x|
+        elem = User.new(self.appliance_url, self.appliance_api_key, self.sec_key, self.insecure)
+        elem.email = x["email"] if x.include?("email")
+        elem.expiry = x["expiry"] if x.include?("expiry")
+        elem.id = x["id"] if x.include?("id")
+        elem.invited = x["invited"] if x.include?("invited")
+        elem.last_sign_in_at = x["last_sign_in_at"] if x.include?("last_sign_in_at")
+        elem.name = x["name"] if x.include?("name")
+        elem.role = x["role"] if x.include?("role")
+        elem.surname = x["surname"] if x.include?("surname")
+        elem.external_id = x["external_id"] if x.include?("external_id")
         the_list << elem
       end
       return the_list
@@ -395,6 +532,12 @@ module UpGuard
       return obj
     end
 
+    def remove_user(email)
+      url = "/api/v2/users/remove.json?email=#{email}"
+      obj = http_put(url, nil)
+      return obj
+    end
+
 
   end
 end