-
Notifications
You must be signed in to change notification settings - Fork 148
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[Filebeat] Enable journald input in releases (#27351)
Use the main-debian8 variant of golang-crossbuilder to build Filebeat packages for linux/amd64 and linux/368. Previously a debian7 image was used, but debian7 does not have the systemd libraries needed for journald. Debian 8 uses glibc 2.19 and debian 7 uses 2.13. We used debian7 because the binaries produced worked on RHEL 6 which has glibc 2.12. To ensure that the Filebeat binaries for linux/amd64 and linux/386 continue to work on RHEL 6 the build process will check the glibc requirement to ensure it is <=2.12. To keep the linked glibc version compatible with RHEL 6 I had to upgrade to github.com/dgraph-io/badger/v3 from v2. v3 removed a bunch of cgo usages which reduced the need on various libc functions. badger adopted golang/glog for logging. This library is adds global CLI flags that conflict with Beats own logging CLI flags (like '-v'). This is a common problem for glog (k8s encountered this). To address the problem I forked golang/glog and made the flag.FlagSet used by the library configurable.
- Loading branch information
1 parent
bd000bc
commit 6b41742
Showing
19 changed files
with
554 additions
and
106 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,67 @@ | ||
| // Licensed to Elasticsearch B.V. under one or more contributor | ||
| // license agreements. See the NOTICE file distributed with | ||
| // this work for additional information regarding copyright | ||
| // ownership. Elasticsearch B.V. licenses this file to you under | ||
| // the Apache License, Version 2.0 (the "License"); you may | ||
| // not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, | ||
| // software distributed under the License is distributed on an | ||
| // "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| // KIND, either express or implied. See the License for the | ||
| // specific language governing permissions and limitations | ||
| // under the License. | ||
|
|
||
| package mage | ||
|
|
||
| import ( | ||
| "fmt" | ||
| "regexp" | ||
| "strconv" | ||
| ) | ||
|
|
||
| var SemanticVersionRegex = regexp.MustCompile(`(?m)^(\d+)\.(\d+)(?:\.(\d+))?`) | ||
|
|
||
| type SemanticVersion struct { | ||
| Major, Minor, Patch int | ||
| } | ||
|
|
||
| // NewSemanticVersion return a new SemanticVersion parsed from string in the | ||
| // format of 'x.y' or 'x.y.z'. | ||
| func NewSemanticVersion(s string) (*SemanticVersion, error) { | ||
| matches := SemanticVersionRegex.FindStringSubmatch(s) | ||
| if len(matches) < 4 { | ||
| return nil, fmt.Errorf("invalid version format %q", s) | ||
| } | ||
|
|
||
| major, _ := strconv.Atoi(matches[1]) | ||
| Minor, _ := strconv.Atoi(matches[2]) | ||
| Patch, _ := strconv.Atoi(matches[3]) | ||
| return &SemanticVersion{major, Minor, Patch}, nil | ||
| } | ||
|
|
||
| // LessThan return true iff s is less than x. | ||
| func (s *SemanticVersion) LessThan(x *SemanticVersion) bool { | ||
| if s.Major != x.Major { | ||
| return s.Major < x.Major | ||
| } | ||
| if s.Minor != x.Minor { | ||
| return s.Minor < x.Minor | ||
| } | ||
| return s.Patch < x.Patch | ||
| } | ||
|
|
||
| // LessThanOrEqual return true iff s is less than or equal to x. | ||
| func (s *SemanticVersion) LessThanOrEqual(x *SemanticVersion) bool { | ||
| if s.LessThan(x) { | ||
| return true | ||
| } | ||
| return !x.LessThan(s) | ||
| } | ||
|
|
||
| func (s SemanticVersion) String() string { | ||
| return fmt.Sprintf("%d.%d.%d", s.Major, s.Minor, s.Patch) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.