Skip to content

Commit

Permalink
Add build constraints to support non-linux systems
Browse files Browse the repository at this point in the history
  • Loading branch information
belimawr committed Oct 11, 2024
1 parent fbfdbbe commit ea2e833
Show file tree
Hide file tree
Showing 3 changed files with 80 additions and 21 deletions.
21 changes: 0 additions & 21 deletions filebeat/input/systemlogs/input.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ import (

"github.com/elastic/beats/v7/filebeat/channel"
v1 "github.com/elastic/beats/v7/filebeat/input"
"github.com/elastic/beats/v7/filebeat/input/journald"
loginput "github.com/elastic/beats/v7/filebeat/input/log"
v2 "github.com/elastic/beats/v7/filebeat/input/v2"
cursor "github.com/elastic/beats/v7/filebeat/input/v2/input-cursor"
Expand Down Expand Up @@ -86,26 +85,6 @@ func newV1Input(
return loginput.NewInput(logCfg, outlet, context)
}

// configure checks whether the journald input must be created and
// delegates to journald.Configure if needed.
func configure(cfg *conf.C) ([]cursor.Source, cursor.Input, error) {
jouranl, err := useJournald(cfg)
if err != nil {
return nil, nil, fmt.Errorf("cannot decide between journald and files: %w", err)
}

if !jouranl {
return nil, nil, v2.ErrUnknownInput
}

journaldCfg, err := toJournaldConfig(cfg)
if err != nil {
return nil, nil, err
}

return journald.Configure(journaldCfg)
}

// PluginV2 creates a v2.Plugin that will instantiate a journald
// input if needed.
func PluginV2(logger *logp.Logger, store cursor.StateStore) v2.Plugin {
Expand Down
49 changes: 49 additions & 0 deletions filebeat/input/systemlogs/input_linux.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
// 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.

//go:build linux

package systemlogs

import (
"fmt"

"github.com/elastic/beats/v7/filebeat/input/journald"
v2 "github.com/elastic/beats/v7/filebeat/input/v2"
cursor "github.com/elastic/beats/v7/filebeat/input/v2/input-cursor"
conf "github.com/elastic/elastic-agent-libs/config"
)

// configure checks whether the journald input must be created and
// delegates to journald.Configure if needed.
func configure(cfg *conf.C) ([]cursor.Source, cursor.Input, error) {
jouranl, err := useJournald(cfg)
if err != nil {
return nil, nil, fmt.Errorf("cannot decide between journald and files: %w", err)
}

if !jouranl {
return nil, nil, v2.ErrUnknownInput
}

journaldCfg, err := toJournaldConfig(cfg)
if err != nil {
return nil, nil, err
}

return journald.Configure(journaldCfg)
}
31 changes: 31 additions & 0 deletions filebeat/input/systemlogs/input_other.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
// 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.

//go:build !linux

package systemlogs

import (
"errors"

cursor "github.com/elastic/beats/v7/filebeat/input/v2/input-cursor"
conf "github.com/elastic/elastic-agent-libs/config"
)

func configure(cfg *conf.C) ([]cursor.Source, cursor.Input, error) {
return nil, nil, errors.New("journald is only supported on Linux")
}

0 comments on commit ea2e833

Please sign in to comment.