redhat_access 2.2.2 → 2.2.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/app/controllers/redhat_access/api/telemetry_api_controller.rb +5 -5
- data/app/services/redhat_access/telemetry/look_ups.rb +3 -3
- data/app/views/redhat_access/analytics_dashboard/index.html.erb +1 -1
- data/lib/redhat_access/version.rb +1 -1
- data/redhat_access.gemspec +1 -1
- metadata +3 -3
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 129ccd6b2b9665d4e88965ec894ded8a738b708b
|
|
4
|
+
data.tar.gz: 3ec205c4e817f4b75ce67bbd31d4600d08da6214
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: '098bb113d0482f6e51604b1b93d99ee0c28f2253bbb9a4137c939f97f6b978d7bbab4a0a1c3871984af3bfe6099e82eb7ee966d4db79e4f82a2f6dd350ba6652'
|
|
7
|
+
data.tar.gz: b8966455930086677746dc55bdb0029a1befc6d9571dac67c900b4fc3ae1af12a61e3a8d800e558349e77701369731e284fffdb485ab13b02cb5b95ecccdb705
|
|
@@ -26,7 +26,7 @@ module RedhatAccess
|
|
|
26
26
|
end
|
|
27
27
|
|
|
28
28
|
def check_telemetry_enabled
|
|
29
|
-
render_telemetry_off unless telemetry_enabled?(
|
|
29
|
+
render_telemetry_off unless telemetry_enabled?(current_organization_object)
|
|
30
30
|
end
|
|
31
31
|
|
|
32
32
|
def render_telemetry_off
|
|
@@ -40,7 +40,7 @@ module RedhatAccess
|
|
|
40
40
|
end
|
|
41
41
|
|
|
42
42
|
def get_auth_opts(creds)
|
|
43
|
-
return get_ssl_options_for_org(
|
|
43
|
+
return get_ssl_options_for_org(current_organization_object, nil)
|
|
44
44
|
end
|
|
45
45
|
|
|
46
46
|
def index
|
|
@@ -51,7 +51,7 @@ module RedhatAccess
|
|
|
51
51
|
# # Returns an array of the machine IDs that this user has access to
|
|
52
52
|
def get_machines
|
|
53
53
|
#TODO err out if org is not selected
|
|
54
|
-
machines = get_content_hosts(
|
|
54
|
+
machines = get_content_hosts(current_organization_object)
|
|
55
55
|
if machines.empty?
|
|
56
56
|
machines = ['NULL_SET']
|
|
57
57
|
end
|
|
@@ -60,7 +60,7 @@ module RedhatAccess
|
|
|
60
60
|
|
|
61
61
|
|
|
62
62
|
def get_current_organization
|
|
63
|
-
|
|
63
|
+
current_organization_object
|
|
64
64
|
end
|
|
65
65
|
|
|
66
66
|
def connection_status
|
|
@@ -162,7 +162,7 @@ module RedhatAccess
|
|
|
162
162
|
|
|
163
163
|
|
|
164
164
|
def get_branch_id
|
|
165
|
-
get_branch_id_for_org(
|
|
165
|
+
get_branch_id_for_org(current_organization_object)
|
|
166
166
|
end
|
|
167
167
|
|
|
168
168
|
def get_api_client
|
|
@@ -33,8 +33,8 @@ module RedhatAccess
|
|
|
33
33
|
end
|
|
34
34
|
|
|
35
35
|
def is_org_selected?
|
|
36
|
-
Rails.logger.debug("Org selected ? #{
|
|
37
|
-
|
|
36
|
+
Rails.logger.debug("Org selected ? #{current_organization_object.nil?}")
|
|
37
|
+
current_organization_object.nil? ? false : true
|
|
38
38
|
end
|
|
39
39
|
|
|
40
40
|
def get_telemetry_config(org)
|
|
@@ -47,7 +47,7 @@ module RedhatAccess
|
|
|
47
47
|
REDHAT_ACCESS_CONFIG[:telemetry_api_host]
|
|
48
48
|
end
|
|
49
49
|
|
|
50
|
-
def
|
|
50
|
+
def current_organization_object
|
|
51
51
|
Organization.current || Organization.find_by_id(session[:organization_id]) if session[:organization_id]
|
|
52
52
|
end
|
|
53
53
|
|
|
@@ -60,7 +60,7 @@
|
|
|
60
60
|
REDHAT_ACCESS_SETTINGS.Insights.canUnregisterSystems = <%= can_unregister_system(User.current) %>;
|
|
61
61
|
REDHAT_ACCESS_SETTINGS.Insights.canIgnoreRules = <%= can_mask_rules(User.current) %>;
|
|
62
62
|
REDHAT_ACCESS_SETTINGS.currentLocale = '<%= (I18n.locale)[0..1] %>';
|
|
63
|
-
REDHAT_ACCESS_SETTINGS.Insights.org_id = <%=
|
|
63
|
+
REDHAT_ACCESS_SETTINGS.Insights.org_id = <%= current_organization_object.id%>;
|
|
64
64
|
REDHAT_ACCESS_SETTINGS.Insights.AnsibleRunnerTmplId = 1 ; //TODO fix this
|
|
65
65
|
<%end%>
|
|
66
66
|
<%= javascript_include_tag "insights/application" %>
|
data/redhat_access.gemspec
CHANGED
|
@@ -9,7 +9,7 @@ Gem::Specification.new do |s|
|
|
|
9
9
|
s.version = RedhatAccess::VERSION
|
|
10
10
|
s.authors = ["Lindani Phiri"]
|
|
11
11
|
s.email = ["lphiri@redhat.com"]
|
|
12
|
-
s.homepage = "
|
|
12
|
+
s.homepage = "https://github.com/redhataccess/foreman-plugin"
|
|
13
13
|
s.license = 'GPLv3'
|
|
14
14
|
s.summary = "Plugin to add Redhat Access to Foreman"
|
|
15
15
|
s.description = "This plugin adds Red Hat Access knowledge base search, case management and diagnostics to Foreman"
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: redhat_access
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 2.2.
|
|
4
|
+
version: 2.2.3
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Lindani Phiri
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2019-
|
|
11
|
+
date: 2019-03-26 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: redhat_access_lib
|
|
@@ -317,7 +317,7 @@ files:
|
|
|
317
317
|
- vendor/assets/stylesheets/redhat_access/redhat_access_angular_ui-deps.css
|
|
318
318
|
- vendor/assets/stylesheets/redhat_access/redhat_access_angular_ui.css
|
|
319
319
|
- vendor/assets/stylesheets/telemetry/sat6.css
|
|
320
|
-
homepage:
|
|
320
|
+
homepage: https://github.com/redhataccess/foreman-plugin
|
|
321
321
|
licenses:
|
|
322
322
|
- GPLv3
|
|
323
323
|
metadata: {}
|