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

Drop analytics integration #9

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Drop analytics integration #9

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
3 changes: 1 addition & 2 deletions acceptance/suites/pre_suite/foss/80_configure_puppet.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@
end
end

config = { 'certificate-authority' => { 'allow-subject-alt-names' => true },
'dropsonde' => { 'enabled' => false }}
config = { 'certificate-authority' => { 'allow-subject-alt-names' => true } }
path = '/etc/puppetlabs/puppetserver/conf.d/puppetserver.conf'
modify_tk_config(master, path, config)
end
1 change: 0 additions & 1 deletion dev/bootstrap.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ puppetlabs.trapperkeeper.services.status.status-service/status-service
puppetlabs.trapperkeeper.services.metrics.metrics-service/metrics-service
puppetlabs.trapperkeeper.services.metrics.metrics-service/metrics-webservice
puppetlabs.services.jruby.jruby-metrics-service/jruby-metrics-service
puppetlabs.services.analytics.analytics-service/analytics-service
puppetlabs.trapperkeeper.services.watcher.filesystem-watch-service/filesystem-watch-service

# To enable the CA service, leave the following line uncommented
Expand Down
4 changes: 0 additions & 4 deletions dev/puppetserver.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,6 @@ product: {
artifact-id: puppetserver}
}

dropsonde: {
enabled: false
}

webserver: {
access-log-config: ./dev/request-logging-dev.xml
client-auth: want
Expand Down
1 change: 0 additions & 1 deletion ext/thread_test/bootstrap.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ puppetlabs.trapperkeeper.services.status.status-service/status-service
puppetlabs.trapperkeeper.services.metrics.metrics-service/metrics-service
puppetlabs.trapperkeeper.services.metrics.metrics-service/metrics-webservice
puppetlabs.services.jruby.jruby-metrics-service/jruby-metrics-service
puppetlabs.services.analytics.analytics-service/analytics-service
puppetlabs.trapperkeeper.services.watcher.filesystem-watch-service/filesystem-watch-service

# To enable the CA service, leave the following line uncommented
Expand Down
1 change: 0 additions & 1 deletion ezbake/system-config/services.d/bootstrap.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,3 @@ puppetlabs.trapperkeeper.services.status.status-service/status-service
puppetlabs.trapperkeeper.services.metrics.metrics-service/metrics-service
puppetlabs.trapperkeeper.services.metrics.metrics-service/metrics-webservice
puppetlabs.services.jruby.jruby-metrics-service/jruby-metrics-service
puppetlabs.services.analytics.analytics-service/analytics-service
1 change: 0 additions & 1 deletion project.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,6 @@
puppetlabs.puppetserver.cli.ruby
puppetlabs.puppetserver.cli.irb
puppetlabs.puppetserver.cli.gem
puppetlabs.services.analytics.analytics-service
puppetlabs.services.protocols.legacy-routes]}
:ci {:plugins [[lein-pprint "1.1.1"]
[lein-exec "0.3.7"]]}}
Expand Down
2 changes: 0 additions & 2 deletions resources/ext/build-scripts/dropsonde-gem.txt
View file
Open in desktop

This file was deleted.

10 changes: 0 additions & 10 deletions resources/ext/build-scripts/install-vendored-gems.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,13 +56,3 @@ cat "${DIR}/mri-gem-list-no-dependencies.txt"
echo "jruby-puppet: { gem-home: ${DESTDIR}/opt/puppetlabs/puppet/lib/ruby/vendor_gems }" > jruby.conf

install_gems "${DIR}/mri-gem-list-no-dependencies.txt" "--ignore-dependencies"

# We need to install Dropsonde into an isolated directory so that its dependencies
# can be installed with it without relying on the gems otherwise shipped by
# puppet-agent or by puppetserver.
echo "Installing Dropsonde into an isolated directory, to prevent dependency conflicts"
cat "${DIR}/dropsonde-gem.txt"

echo "jruby-puppet: { gem-home: ${DESTDIR}/opt/puppetlabs/server/data/puppetserver/dropsonde }" > jruby.conf

install_gems "${DIR}/dropsonde-gem.txt"
16 changes: 0 additions & 16 deletions resources/ext/cli/dropsonde.erb
View file
Open in desktop

This file was deleted.

9 changes: 0 additions & 9 deletions resources/ext/config/conf.d/puppetserver.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,12 +72,3 @@ profiler: {
# enable or disable profiling for the Ruby code; defaults to 'true'.
#enabled: true
}

# settings related to submitting module metrics via Dropsonde
dropsonde: {
# enabled: true

# How long, in seconds, to wait between dropsonde submissions
# Defaults to one week.
# interval: 604800
}
65 changes: 0 additions & 65 deletions src/clj/puppetlabs/services/analytics/analytics_service.clj
View file
Open in desktop

This file was deleted.

34 changes: 0 additions & 34 deletions src/clj/puppetlabs/services/analytics/dropsonde.clj
View file
Open in desktop

This file was deleted.

67 changes: 0 additions & 67 deletions test/integration/puppetlabs/services/analytics/analytics_service_test.clj
View file
Open in desktop

This file was deleted.

Loading