Skip to content

Commit 8cc4b81

Browse files
feat: drop init.d support and go-daemon binaries (#41845) (#42720)
* feat: drop init.d support and go-daemon binaries remove init.d scripts drop go-daemon dep and daemon binaries cleanup mage tasks * lint: fix linter issues * docs: remove reference to init.d scripts (cherry picked from commit 5fbf359) Co-authored-by: kruskall <[email protected]>
1 parent fc4416d commit 8cc4b81

File tree

26 files changed

+14
-869
lines changed

26 files changed

+14
-869
lines changed

NOTICE.txt

-37
Original file line numberDiff line numberDiff line change
@@ -22946,43 +22946,6 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
2294622946
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2294722947

2294822948

22949-
--------------------------------------------------------------------------------
22950-
Dependency : github.com/tsg/go-daemon
22951-
Version: v0.0.0-20200207173439-e704b93fd89b
22952-
Licence type (autodetected): BSD-3-Clause
22953-
--------------------------------------------------------------------------------
22954-
22955-
Contents of probable licence file $GOMODCACHE/github.com/tsg/[email protected]/LICENSE:
22956-
22957-
Copyright (c) 2013-2014 Alexandre Fiori. All rights reserved.
22958-
22959-
Redistribution and use in source and binary forms, with or without
22960-
modification, are permitted provided that the following conditions are
22961-
met:
22962-
22963-
* Redistributions of source code must retain the above copyright
22964-
notice, this list of conditions and the following disclaimer.
22965-
* Redistributions in binary form must reproduce the above
22966-
copyright notice, this list of conditions and the following disclaimer
22967-
in the documentation and/or other materials provided with the
22968-
distribution.
22969-
* The names of authors or contributors may NOT be used to endorse or
22970-
promote products derived from this software without specific prior
22971-
written permission.
22972-
22973-
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
22974-
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
22975-
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
22976-
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
22977-
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
22978-
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
22979-
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
22980-
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
22981-
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
22982-
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
22983-
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
22984-
22985-
2298622949
--------------------------------------------------------------------------------
2298722950
Dependency : github.com/ugorji/go/codec
2298822951
Version: v1.1.8

auditbeat/magefile.go

+1-11
Original file line numberDiff line numberDiff line change
@@ -65,21 +65,11 @@ func GolangCrossBuild() error {
6565
)
6666
}
6767

68-
// BuildGoDaemon builds the go-daemon binary (use crossBuildGoDaemon).
69-
func BuildGoDaemon() error {
70-
return devtools.BuildGoDaemon()
71-
}
72-
7368
// CrossBuild cross-builds the beat for all target platforms.
7469
func CrossBuild() error {
7570
return devtools.CrossBuild()
7671
}
7772

78-
// CrossBuildGoDaemon cross-builds the go-daemon binary using Docker.
79-
func CrossBuildGoDaemon() error {
80-
return devtools.CrossBuildGoDaemon()
81-
}
82-
8373
// AssembleDarwinUniversal merges the darwin/amd64 and darwin/arm64 into a single
8474
// universal binary using `lipo`. It assumes the darwin/amd64 and darwin/arm64
8575
// were built and only performs the merge.
@@ -100,7 +90,7 @@ func Package() {
10090
auditbeat.CustomizePackaging(auditbeat.OSSPackaging)
10191

10292
mg.SerialDeps(Fields, Dashboards, Config, devtools.GenerateModuleIncludeListGo)
103-
mg.Deps(CrossBuild, CrossBuildGoDaemon)
93+
mg.Deps(CrossBuild)
10494
mg.SerialDeps(devtools.Package, TestPackages)
10595
}
10696

dev-tools/mage/godaemon.go

-85
This file was deleted.

dev-tools/mage/target/build/build.go

-10
Original file line numberDiff line numberDiff line change
@@ -38,21 +38,11 @@ func GolangCrossBuild() error {
3838
return devtools.GolangCrossBuild(devtools.DefaultGolangCrossBuildArgs())
3939
}
4040

41-
// BuildGoDaemon builds the go-daemon binary (use crossBuildGoDaemon).
42-
func BuildGoDaemon() error {
43-
return devtools.BuildGoDaemon()
44-
}
45-
4641
// CrossBuild cross-builds the beat for all target platforms.
4742
func CrossBuild() error {
4843
return devtools.CrossBuild()
4944
}
5045

51-
// CrossBuildGoDaemon cross-builds the go-daemon binary using Docker.
52-
func CrossBuildGoDaemon() error {
53-
return devtools.CrossBuildGoDaemon()
54-
}
55-
5646
// AssembleDarwinUniversal merges the darwin/amd64 and darwin/arm64 into a single
5747
// universal binary using `lipo`. It's automatically invoked by CrossBuild whenever
5848
// the darwin/amd64 and darwin/arm64 are present.

dev-tools/packaging/packages.yml

-6
Original file line numberDiff line numberDiff line change
@@ -49,18 +49,12 @@ shared:
4949
/usr/share/{{.BeatName}}/kibana:
5050
source: _meta/kibana.generated
5151
mode: 0644
52-
/usr/share/{{.BeatName}}/bin/{{.BeatName}}-god:
53-
source: build/golang-crossbuild/god-{{.GOOS}}-{{.Platform.Arch}}
54-
mode: 0755
5552
/usr/bin/{{.BeatName}}:
5653
template: '{{ elastic_beats_dir }}/dev-tools/packaging/templates/linux/beatname.sh.tmpl'
5754
mode: 0755
5855
/lib/systemd/system/{{.BeatServiceName}}.service:
5956
template: '{{ elastic_beats_dir }}/dev-tools/packaging/templates/linux/systemd.unit.tmpl'
6057
mode: 0644
61-
/etc/init.d/{{.BeatServiceName}}:
62-
template: '{{ elastic_beats_dir }}/dev-tools/packaging/templates/{{.PackageType}}/init.sh.tmpl'
63-
mode: 0755
6458

6559
# MacOS pkg spec for community beats.
6660
- &macos_beat_pkg_spec

dev-tools/packaging/templates/deb/elastic-agent.init.sh.tmpl

-165
This file was deleted.

0 commit comments

Comments
 (0)