File tree Expand file tree Collapse file tree 8 files changed +12
-12
lines changed Expand file tree Collapse file tree 8 files changed +12
-12
lines changed Original file line number Diff line number Diff line change 17
17
default [ 'splunk_otel_collector' ] [ 'splunk_api_url' ] = "https://api.#{ node [ 'splunk_otel_collector' ] [ 'splunk_realm' ] } .signalfx.com"
18
18
default [ 'splunk_otel_collector' ] [ 'splunk_ingest_url' ] = "https://ingest.#{ node [ 'splunk_otel_collector' ] [ 'splunk_realm' ] } .signalfx.com"
19
19
default [ 'splunk_otel_collector' ] [ 'splunk_hec_url' ] = "#{ node [ 'splunk_otel_collector' ] [ 'splunk_ingest_url' ] } /v1/log"
20
- default [ 'splunk_otel_collector' ] [ 'splunk_hec_token' ] = " #{ node [ 'splunk_otel_collector' ] [ 'splunk_access_token' ] } "
20
+ default [ 'splunk_otel_collector' ] [ 'splunk_hec_token' ] = node [ 'splunk_otel_collector' ] [ 'splunk_access_token' ] . to_s
21
21
default [ 'splunk_otel_collector' ] [ 'splunk_memory_total_mib' ] = '512'
22
22
default [ 'splunk_otel_collector' ] [ 'gomemlimit' ] = ''
23
23
default [ 'splunk_otel_collector' ] [ 'splunk_listen_interface' ] = ''
Original file line number Diff line number Diff line change @@ -101,7 +101,7 @@ suites:
101
101
attributes :
102
102
nodejs : &nodejs_options
103
103
install_method : binary
104
- version : 16 .20.2
104
+ version : 18 .20.8
105
105
binary :
106
106
append_env_path : false # required for idempotence
107
107
checksum : c9193e6c414891694759febe846f4f023bf48410a6924a8b1520c46565859665
Original file line number Diff line number Diff line change 62
62
options '--allow-downgrades' if platform_family? ( 'debian' ) \
63
63
&& node [ 'packages' ] \
64
64
&& node [ 'packages' ] [ 'apt' ] \
65
- && Gem ::Version . new ( node [ 'packages' ] [ 'apt' ] [ 'version' ] . split ( '~' ) [ 0 ] ) >= Gem ::Version . new ( '1.1.0' )
65
+ && Gem ::Version . new ( node [ 'packages' ] [ 'apt' ] [ 'version' ] . split ( '~' ) . first ) >= Gem ::Version . new ( '1.1.0' )
66
66
allow_downgrade true if platform_family? ( 'amazon' , 'rhel' , 'suse' )
67
67
notifies :reload , 'ohai[reload packages]' , :immediately
68
68
notifies :run , 'ruby_block[install splunk-otel-js]' , :immediately
Original file line number Diff line number Diff line change 29
29
end
30
30
31
31
remote_file node [ 'splunk_otel_collector' ] [ 'collector_config_dest' ] do
32
- source " #{ node [ 'splunk_otel_collector' ] [ 'collector_config_source' ] } "
32
+ source node [ 'splunk_otel_collector' ] [ 'collector_config_source' ] . to_s
33
33
only_if { ::File . exist? ( node [ 'splunk_otel_collector' ] [ 'collector_config_source' ] ) && node [ 'splunk_otel_collector' ] [ 'collector_config' ] == { } }
34
34
notifies :restart , 'windows_service[splunk-otel-collector]' , :delayed
35
35
end
61
61
options '--allow-downgrades' if platform_family? ( 'debian' ) \
62
62
&& node [ 'packages' ] \
63
63
&& node [ 'packages' ] [ 'apt' ] \
64
- && Gem ::Version . new ( node [ 'packages' ] [ 'apt' ] [ 'version' ] . split ( '~' ) [ 0 ] ) >= Gem ::Version . new ( '1.1.0' )
64
+ && Gem ::Version . new ( node [ 'packages' ] [ 'apt' ] [ 'version' ] . split ( '~' ) . first ) >= Gem ::Version . new ( '1.1.0' )
65
65
allow_downgrade true if platform_family? ( 'amazon' , 'rhel' , 'suse' )
66
66
notifies :restart , 'service[splunk-otel-collector]' , :delayed
67
67
end
82
82
end
83
83
84
84
remote_file node [ 'splunk_otel_collector' ] [ 'collector_config_dest' ] do
85
- source " #{ node [ 'splunk_otel_collector' ] [ 'collector_config_source' ] } "
85
+ source node [ 'splunk_otel_collector' ] [ 'collector_config_source' ] . to_s
86
86
owner node [ 'splunk_otel_collector' ] [ 'user' ]
87
87
group node [ 'splunk_otel_collector' ] [ 'group' ]
88
88
mode '0600'
Original file line number Diff line number Diff line change 1
1
# Cookbook:: splunk_otel_collector
2
2
# Recipe:: fluentd_deb_repo
3
3
4
- td_agent_major_version = node [ 'splunk_otel_collector' ] [ 'fluentd_version' ] . split ( '.' ) [ 0 ]
4
+ td_agent_major_version = node [ 'splunk_otel_collector' ] [ 'fluentd_version' ] . split ( '.' ) . first
5
5
codename = node [ 'lsb' ] [ 'codename' ]
6
6
distro = node [ 'platform' ]
7
7
Original file line number Diff line number Diff line change 8
8
options '--allow-downgrades' if platform_family? ( 'debian' ) \
9
9
&& node [ 'packages' ] \
10
10
&& node [ 'packages' ] [ 'apt' ] \
11
- && Gem ::Version . new ( node [ 'packages' ] [ 'apt' ] [ 'version' ] . split ( '~' ) [ 0 ] ) >= Gem ::Version . new ( '1.1.0' )
11
+ && Gem ::Version . new ( node [ 'packages' ] [ 'apt' ] [ 'version' ] . split ( '~' ) . first ) >= Gem ::Version . new ( '1.1.0' )
12
12
13
13
allow_downgrade true if platform_family? ( 'rhel' , 'amazon' )
14
14
notifies :restart , 'service[td-agent]' , :delayed
64
64
end
65
65
66
66
remote_file node [ 'splunk_otel_collector' ] [ 'fluentd_config_dest' ] do
67
- source " #{ node [ 'splunk_otel_collector' ] [ 'fluentd_config_source' ] } "
67
+ source node [ 'splunk_otel_collector' ] [ 'fluentd_config_source' ] . to_s
68
68
owner 'td-agent'
69
69
group 'td-agent'
70
70
mode '0644'
Original file line number Diff line number Diff line change 1
1
# Cookbook:: splunk_otel_collector
2
2
# Recipe:: fluentd_win_install
3
3
4
- td_agent_major_version = node [ 'splunk_otel_collector' ] [ 'fluentd_version' ] . split ( '.' ) [ 0 ]
4
+ td_agent_major_version = node [ 'splunk_otel_collector' ] [ 'fluentd_version' ] . split ( '.' ) . first
5
5
6
6
remote_file "#{ ENV [ 'TEMP' ] } \\ td-agent-#{ node [ 'splunk_otel_collector' ] [ 'fluentd_version' ] } -x64.msi" do
7
7
source "#{ node [ 'splunk_otel_collector' ] [ 'fluentd_base_url' ] } /#{ td_agent_major_version } /windows/td-agent-#{ node [ 'splunk_otel_collector' ] [ 'fluentd_version' ] } -x64.msi"
30
30
end
31
31
32
32
remote_file node [ 'splunk_otel_collector' ] [ 'fluentd_config_dest' ] do
33
- source " #{ node [ 'splunk_otel_collector' ] [ 'fluentd_config_source' ] } "
33
+ source node [ 'splunk_otel_collector' ] [ 'fluentd_config_source' ] . to_s
34
34
notifies :restart , 'windows_service[td-agent]' , :delayed
35
35
end
36
36
Original file line number Diff line number Diff line change 1
1
# Cookbook:: splunk_otel_collector
2
2
# Recipe:: collector_yum_repo
3
3
4
- td_agent_major_version = node [ 'splunk_otel_collector' ] [ 'fluentd_version' ] . split ( '.' ) [ 0 ]
4
+ td_agent_major_version = node [ 'splunk_otel_collector' ] [ 'fluentd_version' ] . split ( '.' ) . first
5
5
6
6
distro = if platform_family? ( 'amazon' )
7
7
'amazon'
You can’t perform that action at this time.
0 commit comments