Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update fluentd url for windows #3635

Merged
merged 1 commit into from
Sep 14, 2023
Merged

Update fluentd url for windows #3635

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion deployments/ansible/roles/collector/tasks/win_fluentd_install.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
- name: Set fluentd package sources
ansible.builtin.set_fact:
td_agent_base_url: https://packages.treasuredata.com
td_agent_base_url: https://s3.amazonaws.com/packages.treasuredata.com
win_fluentd_msi: td-agent-{{td_agent_version}}-x64.msi

- name: Push Custom Config file for fluentd, if provided
Expand Down
3 changes: 2 additions & 1 deletion deployments/chef/attributes/default.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
default['splunk_otel_collector']['collector_config'] = {}

default['splunk_otel_collector']['with_fluentd'] = false
default['splunk_otel_collector']['fluentd_base_url'] = 'https://packages.treasuredata.com'
default['splunk_otel_collector']['fluentd_version'] = if platform_family?('debian')
case node['lsb']['codename']
when 'stretch'
Expand All @@ -52,6 +51,7 @@
default['splunk_otel_collector']['splunk_bundle_dir'] = "#{collector_install_dir}\\agent-bundle"
default['splunk_otel_collector']['splunk_collectd_dir'] = "#{node['splunk_otel_collector']['splunk_bundle_dir']}\\run\\collectd"

default['splunk_otel_collector']['fluentd_base_url'] = 'https://s3.amazonaws.com/packages.treasuredata.com'
default['splunk_otel_collector']['fluentd_config_source'] = 'file:///' + "#{collector_install_dir}\\fluentd\\td-agent.conf"
default['splunk_otel_collector']['fluentd_config_dest'] = "#{ENV['SystemDrive']}\\opt\\td-agent\\etc\\td-agent\\td-agent.conf"
default['splunk_otel_collector']['fluentd_version_file'] = "#{collector_install_dir}\\fluentd_version.txt"
Expand Down Expand Up @@ -83,6 +83,7 @@
default['splunk_otel_collector']['user'] = 'splunk-otel-collector'
default['splunk_otel_collector']['group'] = 'splunk-otel-collector'

default['splunk_otel_collector']['fluentd_base_url'] = 'https://packages.treasuredata.com'
default['splunk_otel_collector']['fluentd_config_source'] = 'file:///etc/otel/collector/fluentd/fluent.conf'
default['splunk_otel_collector']['fluentd_config_dest'] = '/etc/otel/collector/fluentd/fluent.conf'

Expand Down
2 changes: 1 addition & 1 deletion deployments/puppet/manifests/init.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
$apt_gpg_key = 'https://splunk.jfrog.io/splunk/otel-collector-deb/splunk-B3CD4420.gpg',
$yum_gpg_key = 'https://splunk.jfrog.io/splunk/otel-collector-rpm/splunk-B3CD4420.pub',
$with_fluentd = false,
$fluentd_repo_base = 'https://packages.treasuredata.com',
$fluentd_repo_base = $splunk_otel_collector::params::fluentd_base_url,
$fluentd_gpg_key = 'https://packages.treasuredata.com/GPG-KEY-td-agent',
$fluentd_version = $splunk_otel_collector::params::fluentd_version,
$fluentd_config_source = $splunk_otel_collector::params::fluentd_config_source,
Expand Down
2 changes: 2 additions & 0 deletions deployments/puppet/manifests/params.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
$splunk_collectd_dir = "${splunk_bundle_dir}/run/collectd"
$collector_config_source = "${collector_config_dir}/agent_config.yaml"
$collector_config_dest = $collector_config_source
$fluentd_base_url = 'https://packages.treasuredata.com'
if $::osfamily == 'debian' {
$fluentd_version = downcase($facts['os']['distro']['codename']) ? {
'stretch' => $fluentd_version_stretch,
Expand All @@ -33,6 +34,7 @@
$splunk_collectd_dir = "${splunk_bundle_dir}\\run\\collectd"
$collector_config_source = "${collector_install_dir}\\agent_config.yaml"
$collector_config_dest = "${collector_config_dir}\\agent_config.yaml"
$fluentd_base_url = 'https://s3.amazonaws.com/packages.treasuredata.com'
$fluentd_version = $fluentd_version_default
$fluentd_config_source = "${collector_install_dir}\\fluentd\\td-agent.conf"
$fluentd_config_dest = ''
Expand Down
2 changes: 1 addition & 1 deletion internal/buildscripts/packaging/choco/splunk-otel-collector/tools/fluentd.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
$fluentd_msi_name = "td-agent-4.3.2-x64.msi"
$fluentd_dl_url = "https://packages.treasuredata.com/4/windows/$fluentd_msi_name"
$fluentd_dl_url = "https://s3.amazonaws.com/packages.treasuredata.com/4/windows/$fluentd_msi_name"

try {
Resolve-Path $env:TEMP 2>&1>$null
Expand Down
2 changes: 1 addition & 1 deletion internal/buildscripts/packaging/installer/install.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ try {
$regkey = "HKLM:\SYSTEM\CurrentControlSet\Control\Session Manager\Environment"

$fluentd_msi_name = "td-agent-4.3.2-x64.msi"
$fluentd_dl_url = "https://packages.treasuredata.com/4/windows/$fluentd_msi_name"
$fluentd_dl_url = "https://s3.amazonaws.com/packages.treasuredata.com/4/windows/$fluentd_msi_name"
try {
Resolve-Path $env:SYSTEMDRIVE 2>&1>$null
$fluentd_base_dir = "${env:SYSTEMDRIVE}\opt\td-agent"
Expand Down