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

Automatic merge from master to 6.x branch #5067

Merged
merged 143 commits into from
Aug 31, 2017
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
143 commits
Select commit Hold shift + click to select a range
f9a2738
Set version 7.0.0-alpha1 in the master branch (#4739)
tsg Jul 24, 2017
c0af60c
Set docs version in the master branch (#4741)
tsg Jul 24, 2017
52850a1
Restructure beats config options (#4716)
dedemorton Jul 25, 2017
ff3ab7b
Update libbeat index-pattern version (#4756)
andrewkroh Jul 26, 2017
45fa3c6
Close changelog beta1 (master) (#4754)
tsg Jul 26, 2017
18474a6
Adding support to exclude labels from kubernetes pod metadata (#4757)
vjsamuel Jul 26, 2017
30ee527
Improve test and build time by using -i flag (#4758)
ruflin Jul 26, 2017
5750cc0
Support `npipe` URLs in host parser (#4751)
exekias Jul 26, 2017
38eb3eb
Implementing graphite protocol metricbeat module (#4734)
vjsamuel Jul 27, 2017
47d3db4
Use ProgramData for Windows service logs (#4765)
andrewkroh Jul 27, 2017
4b7f097
Update docs (#4753)
Jul 27, 2017
ce2690e
Fix batch being ACKed on failure in ES monitoring reporter (#4773)
Jul 27, 2017
c4af03c
Clean up exported fields titles (#4768)
dedemorton Jul 27, 2017
f240148
Remove generated beat.yml (#4767)
andrewkroh Jul 28, 2017
4ce5360
Fix mixed up modules configuration (#4772)
tsg Jul 28, 2017
8887cdf
Update test to use named field in composite literal
andrewkroh Jul 28, 2017
2f7e829
Update Metricbeat field docs
andrewkroh Jul 28, 2017
dd8c5fd
List files violating goimports style (#4782)
roncohen Jul 28, 2017
10b73be
Fixing pod name indexer to use both namespace, pod name to frame inde…
vjsamuel Jul 31, 2017
60d83e7
Add setup.template.settings in the reference.yml files (#4791)
monicasarbu Jul 31, 2017
2bf3475
Pin FPM version (#4790)
tsg Jul 31, 2017
231dc54
Pipeline cleanups (#4776)
Jul 31, 2017
5dec511
Add more info for each option under setup.template.settings (#4792)
monicasarbu Jul 31, 2017
b7dbf03
Fix go plugins not loaded when beat starts (#4799)
vjsamuel Aug 1, 2017
eb92974
Implementing graphite protocol metricbeat module (#4734) (#4770)
vjsamuel Aug 1, 2017
07170c6
Enhancements to auditbeat file metricset (#4796)
andrewkroh Aug 1, 2017
20320b3
Use the right `modules.d` folder on Windows build (#4806)
exekias Aug 1, 2017
e912cc1
Remove spurious beat.full.yml (#4803)
exekias Aug 2, 2017
ecf58b5
Update init scripts to use "test config" subcommand (#4797)
andrewkroh Aug 2, 2017
29f05c5
Add breaking change message about using Beats from Windows GUI (#4794)
exekias Aug 2, 2017
747cfd9
Metricbeat tests: split proxy_dep in 3 (#4801)
tsg Aug 2, 2017
44d6f9d
Added required alias property to documentation (#4800)
wovas Aug 2, 2017
1946fe0
Update info about loading dashboards and index templates (#4778)
dedemorton Aug 2, 2017
94a197b
Adds a "type" field to the filesystem beat (#4717) (#4717)
cv Aug 2, 2017
61bd302
Fix HTTP 404 URLs in README (#4822)
mgreau Aug 3, 2017
23d9fe6
Make config object public for graphite and http server (#4820)
vjsamuel Aug 3, 2017
2caf75d
Add PostgresSQL module for Filebeat (#4763)
kvch Aug 8, 2017
fa77316
Add SetValue method to libbeat common.MapStr (#4838)
simitt Aug 8, 2017
38ebb36
add cloudwatchlogsbeat to community beats (#4829)
kkentzo Aug 8, 2017
7aabf7a
Fix link to image in FBM Postgres docs (#4843)
tsg Aug 8, 2017
0008c72
Add support for dynamic param in fields (#4835)
ruflin Aug 8, 2017
d789a32
filebeat: remove unreferenced image from documentation (#4844)
kvch Aug 8, 2017
25fdff8
Increase api version for Beats monitoring (#4793)
monicasarbu Aug 8, 2017
190edf0
Update Filebeat development guide && create _meta/kibana/default fold…
kvch Aug 8, 2017
66d6929
Move most functionality from libbeat/beat to libbeat/cmd package
Aug 1, 2017
1f242a9
Add devices command to packetbeat
Aug 1, 2017
1854f10
removes devices flag from packetbeat
Aug 1, 2017
353c153
Remove FlagHandler support
Aug 1, 2017
5cf2009
Move definitions from libbeat/publisher/beat to libbeat/beat
Aug 2, 2017
d4c876e
move some more config fields to cmd/instance
Aug 2, 2017
cb4dccd
Move common.BeatInfo to beat.Info
Aug 2, 2017
83e433a
Fix conflict after rebase
Aug 2, 2017
c983bc6
Remove packetbeat -devices flag in cobra setup
Aug 8, 2017
592dbbe
review fixes
Aug 8, 2017
5e308c9
Update generator
Aug 8, 2017
11b03ca
metricbeat generator
Aug 8, 2017
0cacffe
fix panic on AddGoFlag
Aug 8, 2017
a1031e8
Fix monitor.name being empty by default (#4856)
Aug 9, 2017
318cc1a
Add exclude and skip-notice feature to generate_notice script (#4858)
ruflin Aug 10, 2017
af3ecf9
Add support for index to fields.yml (#4853)
ruflin Aug 10, 2017
cba395a
Wait for registry to exist on tests (#4862)
ruflin Aug 10, 2017
f2d6035
Fix flaky appveyor filebeat test (#4861)
ruflin Aug 10, 2017
5a5e210
libbeat: change deprecated _default_ mapping to doc in index template…
kvch Aug 10, 2017
6c5f3b2
Added breaking changes doc for 6.0 (#4760)
tsg Aug 10, 2017
92ac985
Revert "Add SetValue method to libbeat common.MapStr (#4838)" (#4868)
simitt Aug 10, 2017
5adf7e1
Fix missing MongoDB config from the `modules.d` folder (#4870)
tsg Aug 11, 2017
93cbda3
Update build_docs.sh script to support dev-guide (#4873)
ruflin Aug 11, 2017
0718b44
Bootstrap xpack password (#4875)
tsg Aug 11, 2017
e8f55ba
Fix wrong timestamp in heartbeat events (#4855)
Aug 11, 2017
c48a32e
Fix MySQL CRUD expression (#4857)
Aug 12, 2017
f6f455f
metricbeat: enhance the system/diskio, add more metrics
PChou Aug 14, 2017
8bc9c80
Remove setup deprecation message (#4889)
exekias Aug 14, 2017
fb3a7a3
- Set by the default the credentials for connecting to Kibana the sam…
monicasarbu Aug 14, 2017
a8b2192
Remove accidental submodule (#4893)
tsg Aug 14, 2017
a1b64cd
Remove all references to removed output.X.flush_interval settings (#4…
Aug 14, 2017
43cd1e7
Add system uptime metricset (#4887)
andrewkroh Aug 14, 2017
d1263b9
Set array type to ObjectType of field if available. (#4896)
simitt Aug 14, 2017
a7103d1
Set value 'dynamic' for groups. (#4894)
simitt Aug 14, 2017
38aae1e
Register kubernetes field_format matcher and remove logger in Encode …
vjsamuel Aug 15, 2017
7f4fd5b
Add doc_values handling for template creation. (#4904)
simitt Aug 15, 2017
0e91ea0
Add docs for new subcommands (#4832)
dedemorton Aug 15, 2017
8c6b706
Update getting started to include info about credentials and new comm…
dedemorton Aug 16, 2017
573c315
filebeat: fix PostgreSQL dashboards (#4905)
kvch Aug 16, 2017
1495b3a
Update and reorganize system module config docs (#4909)
andrewkroh Aug 16, 2017
7b56380
filebeat: add Kafka log module (#4885)
kvch Aug 16, 2017
aa54a22
Add filesystem.ignore_types to ignore filesystem types (#4823) (#4906)
andrewkroh Aug 16, 2017
80869fa
Add support for init contianers in `add_kubernetes_metadata` (#4890)
exekias Aug 16, 2017
c8fc817
Update latest testing environment to 6.0.0-beta1 (#4911)
ruflin Aug 16, 2017
de1e510
[Docs] Add module config reload docs
dedemorton Aug 15, 2017
1039e28
Beats testing guide (#4866)
ruflin Aug 17, 2017
3f50a04
Rename the beatname.sh script to beatname (#4933)
tsg Aug 17, 2017
d424b10
Add kafkabeat to community beats doc (#4935)
makkes Aug 17, 2017
04387ca
[Docs] Add udp prospector to list of types
dedemorton Aug 17, 2017
5b09248
Merge pull request #4930 from dedemorton/modules_reload
dedemorton Aug 18, 2017
7aefcb1
[Docs] Adding missing review changes
dedemorton Aug 18, 2017
fe6cccb
Merge pull request #4941 from dedemorton/add_review_changes
dedemorton Aug 18, 2017
33c0897
Remove _all fields settings from the 5.x template (#4928)
tsg Aug 18, 2017
654eafe
Let docs build fail if not index.asciidoc found (#4945)
ruflin Aug 18, 2017
cb5e05d
Cleanup iostats field naming (#4900)
ruflin Aug 18, 2017
4302f53
Add etcdbeat to the community beats (#4915)
berfinsari Aug 18, 2017
d20e58a
Move TCP UDP start up into server.Start() (#4903)
vjsamuel Aug 18, 2017
ee2ac29
Merge pull request #4940 from dedemorton/add_udp_prospector
dedemorton Aug 18, 2017
aba48f8
Fixes #4950 - Remove mar.local queries from dashboards (#4953)
simianhacker Aug 19, 2017
3826280
Fix flow timestamp update (#4955)
Aug 21, 2017
4dfc9a7
Add 5.x and 6.x rabbitmq dashboards (#4912)
monicasarbu Aug 21, 2017
ec6d077
Fix typo in generate_notice.py script comment (#4963)
ruflin Aug 21, 2017
02a59a1
Allow template pattern to be overwritten (#4769)
ruflin Aug 21, 2017
cc790d7
Add new metrics to CPU metricset (#4969)
kvch Aug 23, 2017
bd6981d
Added cloud.id and cloud.auth config settings (#4964)
tsg Aug 23, 2017
5613c5f
Move template and codec message to debug level (#4966)
ruflin Aug 23, 2017
807bc43
Filebeat modules: Rename dashboards and visualization (#4952)
tsg Aug 23, 2017
ea5f940
Fix typo in reference config file (#4987)
ruflin Aug 24, 2017
66097bd
Adapt packetbeat tcp protocol generator to new publisher pipeline (#4…
Aug 24, 2017
c2360d0
Add option to enable/disable LS output slow start (#4972)
Aug 24, 2017
c9a40eb
Event ACK callbacks only report the events private field (#4978)
Aug 24, 2017
be011f3
Delay device opening (#4939)
Aug 24, 2017
30badf6
Rename all dashboards and viz to follow a similar format (#4979)
monicasarbu Aug 24, 2017
54293d3
closes #4837 Travis errors on chmod command (#4936)
makkes Aug 24, 2017
211f917
Update saram dependency to v1.12 (#4977)
Aug 24, 2017
535439b
Fixes and renamings for Packetbeat dashboards (#5008)
tsg Aug 25, 2017
c80b5b7
Add Cloudfrontbeat to the community beats (#5007)
jarl-tornroos Aug 25, 2017
c70f5d2
Fix redis and rabbitmq dashboards (#5015)
monicasarbu Aug 25, 2017
6130ef3
Make the index name configurable when loading the 6.x and 5.x dashboa…
monicasarbu Aug 25, 2017
366a584
Add registry for prospectors (#4980)
kvch Aug 25, 2017
5657197
Add ceph cluster status to metricbeat (#4990)
elaron Aug 25, 2017
4ac68d2
add_kubernetes_metadata processor: add support for "/var/log/containe…
SvenWoltmann Aug 25, 2017
df0f7ff
Fix /usr/bin/beatname script to accept -d "*" (#5043)
tsg Aug 29, 2017
0fc4dea
Reduce perfmon memory allocations (#5036)
andrewkroh Aug 29, 2017
aecf1eb
Modify events dropping on Close (#5044)
Aug 29, 2017
083834b
Added the beta2 changelog to the master branch (#5033)
tsg Aug 29, 2017
e6e7432
Fix make index-template command (#5034)
ruflin Aug 29, 2017
1faf778
Fix invalid filter error in packetbeat (#5041)
tsg Aug 29, 2017
753cf9e
Improvements to beatname.sh (#5051)
andrewkroh Aug 29, 2017
0bb4c0e
Fix accidental removal of `--setup` flag (#5060)
exekias Aug 30, 2017
a26cd25
beats: generalize import generation for filebeat, packetbeat, metricbeat
kvch Aug 25, 2017
5305cc6
filebeat: add plugin to prospectors
kvch Aug 25, 2017
803b887
filebeat: rename registrarcontext to runnerfactory
kvch Aug 28, 2017
6ddb530
Add new docker-compose management framework
exekias Aug 29, 2017
e227860
Fix Dockerfile healthchecks and unify timing params
exekias Aug 29, 2017
295aa7e
Adapt Metricbeat system tests to new compose framework
exekias Aug 29, 2017
b0c6aee
Adapt Metricbeat integration tests to new compose framework
exekias Aug 29, 2017
25ce8a9
Improve log message for metrics endpoint (#5038)
ruflin Aug 31, 2017
a69eb53
Merge branch 'master' into automatic_merge_from_master_to_6.x_branch
tsg Aug 31, 2017
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
metricbeat generator
  • Loading branch information
urso authored and kvch committed Aug 9, 2017
commit 11b03caa5706eab992878b43fcc55482dd527dd9
9 changes: 5 additions & 4 deletions generator/metricbeat/{beat}/main.go.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,20 @@ package main
import (
"os"

"github.com/elastic/beats/libbeat/beat"
"github.com/elastic/beats/libbeat/cmd/instance"
"github.com/elastic/beats/metricbeat/beater"

// Make sure all your modules and metricsets are linked in this file
_ "{beat_path}/include"
// Comment out the following line to exclude all official metricbeat modules and metricsets
_ "github.com/elastic/beats/metricbeat/include"

// Make sure all your modules and metricsets are linked in this file
_ "{beat_path}/include"
)

var Name = "{beat}"

func main() {
if err := beat.Run(Name, "", beater.New); err != nil {
if err := instance.Run(Name, "", beater.New); err != nil {
os.Exit(1)
}
}
3 changes: 0 additions & 3 deletions metricbeat/cmd/root.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@ import (

"github.com/spf13/pflag"

// import modules
_ "github.com/elastic/beats/metricbeat/include"

cmd "github.com/elastic/beats/libbeat/cmd"
"github.com/elastic/beats/metricbeat/beater"
"github.com/elastic/beats/metricbeat/cmd/test"
Expand Down
3 changes: 3 additions & 0 deletions metricbeat/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@ import (
"os"

"github.com/elastic/beats/metricbeat/cmd"

// import modules
_ "github.com/elastic/beats/metricbeat/include"
)

func main() {
Expand Down