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.

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

[Filebeat]Azure module - activity logs #13776

Merged
merged 24 commits into from
Oct 10, 2019
Merged
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
work on kafka input
  • Loading branch information
narph committed Oct 4, 2019
commit 75ec856b0bb10f5a058779751f64064b24a2bb09
2 changes: 1 addition & 1 deletion filebeat/docs/modules/azure.asciidoc
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@ This file is generated! See scripts/docs_collector.py

[[filebeat-module-azure]]
:modulename: azure
:has-dashboards: true
:has-dashboards: false

== azure module

4 changes: 2 additions & 2 deletions filebeat/input/kafka/config.go
Original file line number Diff line number Diff line change
@@ -104,7 +104,7 @@ var (

// The default config for the kafka input. When in doubt, default values
// were chosen to match sarama's defaults.
func DefaultConfig() kafkaInputConfig {
func defaultConfig() kafkaInputConfig {
return kafkaInputConfig{
Version: kafka.Version("1.0.0"),
InitialOffset: initialOffsetOldest,
@@ -144,7 +144,7 @@ func (c *kafkaInputConfig) Validate() error {
return nil
}

func NewSaramaConfig(config kafkaInputConfig) (*sarama.Config, error) {
func newSaramaConfig(config kafkaInputConfig) (*sarama.Config, error) {
k := sarama.NewConfig()

version, ok := config.Version.Get()
4 changes: 2 additions & 2 deletions filebeat/input/kafka/input.go
Original file line number Diff line number Diff line change
@@ -63,7 +63,7 @@ func NewInput(
inputContext input.Context,
) (input.Input, error) {

config := DefaultConfig()
config := defaultConfig()
if err := cfg.Unpack(&config); err != nil {
return nil, errors.Wrap(err, "reading kafka input config")
}
@@ -86,7 +86,7 @@ func NewInput(
return nil, err
}

saramaConfig, err := NewSaramaConfig(config)
saramaConfig, err := newSaramaConfig(config)
if err != nil {
return nil, errors.Wrap(err, "initializing Sarama config")
}
1 change: 0 additions & 1 deletion x-pack/filebeat/include/list.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 0 additions & 14 deletions x-pack/filebeat/input/azure/config.go

This file was deleted.

31 changes: 0 additions & 31 deletions x-pack/filebeat/input/azure/input.go

This file was deleted.

2 changes: 1 addition & 1 deletion x-pack/filebeat/module/azure/_meta/docs.asciidoc
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
:modulename: azure
:has-dashboards: true
:has-dashboards: false

== azure module

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
type: azure
type: kafka
hosts: {{ .namespace }}
topics: {{ .eventhub }}
group_id: {{ .consumer_group }}
2 changes: 1 addition & 1 deletion x-pack/filebeat/module/azure/activitylogs/manifest.yml
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@ module_version: 1.0

var:
- name: input
default: azure
default: kafka
- name: topics
default: "insights-operational-logs"
- name: consumer_group
2 changes: 1 addition & 1 deletion x-pack/filebeat/module/azure/auditlogs/manifest.yml
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@ module_version: 1.0
var:
- name: input
default: kafka
- name: topics
- name: eventhub
default: "insights-logs-auditlogs"
- name: consumer_group
default: "$Default"
2 changes: 1 addition & 1 deletion x-pack/filebeat/module/azure/signinlogs/manifest.yml
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@ module_version: 1.0
var:
- name: input
default: kafka
- name: topics
- name: eventhub
default: "insights-logs-auditlogs"
- name: consumer_group
default: "$Default"