From 61c433e1bf09f51016aa5cbc782f7cda23a64b73 Mon Sep 17 00:00:00 2001 From: Tudor Golubenco Date: Wed, 16 Sep 2015 20:36:11 +0200 Subject: [PATCH 1/2] Remove build directory. It was committed by mistake here. --- build/packetbeat-darwin.yml | 143 --------------------------------- build/packetbeat-darwin.yml.bk | 143 --------------------------------- build/packetbeat-linux.yml | 143 --------------------------------- build/packetbeat-win.yml | 143 --------------------------------- build/packetbeat-win.yml.bk | 143 --------------------------------- build/packetbeat.template.json | 63 --------------- 6 files changed, 778 deletions(-) delete mode 100644 build/packetbeat-darwin.yml delete mode 100644 build/packetbeat-darwin.yml.bk delete mode 100644 build/packetbeat-linux.yml delete mode 100644 build/packetbeat-win.yml delete mode 100644 build/packetbeat-win.yml.bk delete mode 100644 build/packetbeat.template.json diff --git a/build/packetbeat-darwin.yml b/build/packetbeat-darwin.yml deleted file mode 100644 index 6c704bd92045..000000000000 --- a/build/packetbeat-darwin.yml +++ /dev/null @@ -1,143 +0,0 @@ -################### Packetbeat Configuration Example ######################### - -# This file contains an overview of various configuration settings. Please consult -# the docs at https://www.elastic.co/guide/en/beats/packetbeat/current/_configuration.html -# for more details. - -# The Packetbeat shipper works by sniffing the network traffic between your -# application components. It inserts meta-data about each transaction into -# Elasticsearch. - -############################# Shipper ############################################ -shipper: - - # The name of the shipper that publishes the network data. It can be used to group - # all the transactions sent by a single shipper in the web interface. - # If this options is not defined, the hostname is used. - name: - - # The tags of the shipper are included in their own field with each - # transaction published. Tags make it easy to group transactions by different - # logical properties. - #tags: ["service1"] - - # Uncomment the following if you want to ignore transactions created - # by the server on which the shipper is installed. This option is useful - # to remove duplicates if shippers are installed on multiple servers. - # ignore_outgoing: true - -############################# Sniffer ############################################ - -# Select the network interfaces to sniff the data. You can use the "any" -# keyword to sniff on all connected interfaces. -interfaces: - device: en0 - - -############################# Protocols ###################################### -protocols: - http: - - # Configure the ports where to listen for HTTP traffic. You can disable - # the http protocol by commenting the list of ports. - ports: [80, 8080, 8000, 5000, 8002] - - # Uncomment the following to hide certain parameters in URL or forms attached - # to HTTP requests. The names of the parameters are case insensitive. - # The value of the parameters will be replaced with the 'xxxxx' string. - # This is generally useful for avoiding storing user passwords or other - # sensitive information. - # Only query parameters and top level form parameters are replaced. - # hide_keywords: ['pass', 'password', 'passwd'] - - mysql: - - # Configure the ports where to listen for MySQL traffic. You can disable - # the MySQL protocol by commenting out the list of ports. - ports: [3306] - - pgsql: - - # Configure the ports where to listen for Pgsql traffic. You can disable - # the Pgsql protocol by commenting out the list of ports. - ports: [5432] - - redis: - - # Configure the ports where to listen for Redis traffic. You can disable - # the Redis protocol by commenting out the list of ports. - ports: [6379] - - thrift: - - # Configure the ports where to listen for Thrift traffic. You can disable - # the Thrift protocol by commenting out the list of ports. - ports: [9090] - - mongodb: - # Configure the ports where to listen for Mongodb traffic. You can disable - # the Mongodb protocol by commenting out the list of ports. - ports: [27017] - -############################# Output ############################################ - -# Configure what outputs to use when sending the data collected by packetbeat. -# You can enable one or multiple outputs by setting enabled option to true. -output: - - # Elasticsearch as output - # Options: - # host, port: where Elasticsearch is listening on - # save_topology: specify if the topology is saved in Elasticsearch - elasticsearch: - enabled: true - hosts: ["localhost:9200"] - save_topology: true - - # Redis as output - # Options: - # host, port: where Redis is listening on - # save_topology: specify if the topology is saved in Redis - #redis: - # enabled: true - # host: localhost - # port: 6379 - # save_topology: true - - # File as output - # Options: - # path: where to save the files - # filename: name of the files - # rotate_every_kb: maximum size of the files in path - # number of files: maximum number of files in path - #file: - # enabled: true - # path: "/tmp/packetbeat" - # filename: packetbeat - # rotate_every_kb: 1000 - # number_of_files: 7 - -############################# Processes ############################################ - -# Configure the processes to be monitored and how to find them. If a process is -# monitored than Packetbeat attempts to use it's name to fill in the `proc` and -# `client_proc` fields. -# The processes can be found by searching their command line by a given string. -# -# Process matching is optional and can be enabled by uncommenting the following -# lines. -# -#procs: -# enabled: false -# monitored: -# - process: mysqld -# cmdline_grep: mysqld -# -# - process: pgsql -# cmdline_grep: postgres -# -# - process: nginx -# cmdline_grep: nginx -# -# - process: app -# cmdline_grep: gunicorn diff --git a/build/packetbeat-darwin.yml.bk b/build/packetbeat-darwin.yml.bk deleted file mode 100644 index 53f1c8bfcec3..000000000000 --- a/build/packetbeat-darwin.yml.bk +++ /dev/null @@ -1,143 +0,0 @@ -################### Packetbeat Configuration Example ######################### - -# This file contains an overview of various configuration settings. Please consult -# the docs at https://www.elastic.co/guide/en/beats/packetbeat/current/_configuration.html -# for more details. - -# The Packetbeat shipper works by sniffing the network traffic between your -# application components. It inserts meta-data about each transaction into -# Elasticsearch. - -############################# Shipper ############################################ -shipper: - - # The name of the shipper that publishes the network data. It can be used to group - # all the transactions sent by a single shipper in the web interface. - # If this options is not defined, the hostname is used. - name: - - # The tags of the shipper are included in their own field with each - # transaction published. Tags make it easy to group transactions by different - # logical properties. - #tags: ["service1"] - - # Uncomment the following if you want to ignore transactions created - # by the server on which the shipper is installed. This option is useful - # to remove duplicates if shippers are installed on multiple servers. - # ignore_outgoing: true - -############################# Sniffer ############################################ - -# Select the network interfaces to sniff the data. You can use the "any" -# keyword to sniff on all connected interfaces. -interfaces: - device: any - - -############################# Protocols ###################################### -protocols: - http: - - # Configure the ports where to listen for HTTP traffic. You can disable - # the http protocol by commenting the list of ports. - ports: [80, 8080, 8000, 5000, 8002] - - # Uncomment the following to hide certain parameters in URL or forms attached - # to HTTP requests. The names of the parameters are case insensitive. - # The value of the parameters will be replaced with the 'xxxxx' string. - # This is generally useful for avoiding storing user passwords or other - # sensitive information. - # Only query parameters and top level form parameters are replaced. - # hide_keywords: ['pass', 'password', 'passwd'] - - mysql: - - # Configure the ports where to listen for MySQL traffic. You can disable - # the MySQL protocol by commenting out the list of ports. - ports: [3306] - - pgsql: - - # Configure the ports where to listen for Pgsql traffic. You can disable - # the Pgsql protocol by commenting out the list of ports. - ports: [5432] - - redis: - - # Configure the ports where to listen for Redis traffic. You can disable - # the Redis protocol by commenting out the list of ports. - ports: [6379] - - thrift: - - # Configure the ports where to listen for Thrift traffic. You can disable - # the Thrift protocol by commenting out the list of ports. - ports: [9090] - - mongodb: - # Configure the ports where to listen for Mongodb traffic. You can disable - # the Mongodb protocol by commenting out the list of ports. - ports: [27017] - -############################# Output ############################################ - -# Configure what outputs to use when sending the data collected by packetbeat. -# You can enable one or multiple outputs by setting enabled option to true. -output: - - # Elasticsearch as output - # Options: - # host, port: where Elasticsearch is listening on - # save_topology: specify if the topology is saved in Elasticsearch - elasticsearch: - enabled: true - hosts: ["localhost:9200"] - save_topology: true - - # Redis as output - # Options: - # host, port: where Redis is listening on - # save_topology: specify if the topology is saved in Redis - #redis: - # enabled: true - # host: localhost - # port: 6379 - # save_topology: true - - # File as output - # Options: - # path: where to save the files - # filename: name of the files - # rotate_every_kb: maximum size of the files in path - # number of files: maximum number of files in path - #file: - # enabled: true - # path: "/tmp/packetbeat" - # filename: packetbeat - # rotate_every_kb: 1000 - # number_of_files: 7 - -############################# Processes ############################################ - -# Configure the processes to be monitored and how to find them. If a process is -# monitored than Packetbeat attempts to use it's name to fill in the `proc` and -# `client_proc` fields. -# The processes can be found by searching their command line by a given string. -# -# Process matching is optional and can be enabled by uncommenting the following -# lines. -# -#procs: -# enabled: false -# monitored: -# - process: mysqld -# cmdline_grep: mysqld -# -# - process: pgsql -# cmdline_grep: postgres -# -# - process: nginx -# cmdline_grep: nginx -# -# - process: app -# cmdline_grep: gunicorn diff --git a/build/packetbeat-linux.yml b/build/packetbeat-linux.yml deleted file mode 100644 index 53f1c8bfcec3..000000000000 --- a/build/packetbeat-linux.yml +++ /dev/null @@ -1,143 +0,0 @@ -################### Packetbeat Configuration Example ######################### - -# This file contains an overview of various configuration settings. Please consult -# the docs at https://www.elastic.co/guide/en/beats/packetbeat/current/_configuration.html -# for more details. - -# The Packetbeat shipper works by sniffing the network traffic between your -# application components. It inserts meta-data about each transaction into -# Elasticsearch. - -############################# Shipper ############################################ -shipper: - - # The name of the shipper that publishes the network data. It can be used to group - # all the transactions sent by a single shipper in the web interface. - # If this options is not defined, the hostname is used. - name: - - # The tags of the shipper are included in their own field with each - # transaction published. Tags make it easy to group transactions by different - # logical properties. - #tags: ["service1"] - - # Uncomment the following if you want to ignore transactions created - # by the server on which the shipper is installed. This option is useful - # to remove duplicates if shippers are installed on multiple servers. - # ignore_outgoing: true - -############################# Sniffer ############################################ - -# Select the network interfaces to sniff the data. You can use the "any" -# keyword to sniff on all connected interfaces. -interfaces: - device: any - - -############################# Protocols ###################################### -protocols: - http: - - # Configure the ports where to listen for HTTP traffic. You can disable - # the http protocol by commenting the list of ports. - ports: [80, 8080, 8000, 5000, 8002] - - # Uncomment the following to hide certain parameters in URL or forms attached - # to HTTP requests. The names of the parameters are case insensitive. - # The value of the parameters will be replaced with the 'xxxxx' string. - # This is generally useful for avoiding storing user passwords or other - # sensitive information. - # Only query parameters and top level form parameters are replaced. - # hide_keywords: ['pass', 'password', 'passwd'] - - mysql: - - # Configure the ports where to listen for MySQL traffic. You can disable - # the MySQL protocol by commenting out the list of ports. - ports: [3306] - - pgsql: - - # Configure the ports where to listen for Pgsql traffic. You can disable - # the Pgsql protocol by commenting out the list of ports. - ports: [5432] - - redis: - - # Configure the ports where to listen for Redis traffic. You can disable - # the Redis protocol by commenting out the list of ports. - ports: [6379] - - thrift: - - # Configure the ports where to listen for Thrift traffic. You can disable - # the Thrift protocol by commenting out the list of ports. - ports: [9090] - - mongodb: - # Configure the ports where to listen for Mongodb traffic. You can disable - # the Mongodb protocol by commenting out the list of ports. - ports: [27017] - -############################# Output ############################################ - -# Configure what outputs to use when sending the data collected by packetbeat. -# You can enable one or multiple outputs by setting enabled option to true. -output: - - # Elasticsearch as output - # Options: - # host, port: where Elasticsearch is listening on - # save_topology: specify if the topology is saved in Elasticsearch - elasticsearch: - enabled: true - hosts: ["localhost:9200"] - save_topology: true - - # Redis as output - # Options: - # host, port: where Redis is listening on - # save_topology: specify if the topology is saved in Redis - #redis: - # enabled: true - # host: localhost - # port: 6379 - # save_topology: true - - # File as output - # Options: - # path: where to save the files - # filename: name of the files - # rotate_every_kb: maximum size of the files in path - # number of files: maximum number of files in path - #file: - # enabled: true - # path: "/tmp/packetbeat" - # filename: packetbeat - # rotate_every_kb: 1000 - # number_of_files: 7 - -############################# Processes ############################################ - -# Configure the processes to be monitored and how to find them. If a process is -# monitored than Packetbeat attempts to use it's name to fill in the `proc` and -# `client_proc` fields. -# The processes can be found by searching their command line by a given string. -# -# Process matching is optional and can be enabled by uncommenting the following -# lines. -# -#procs: -# enabled: false -# monitored: -# - process: mysqld -# cmdline_grep: mysqld -# -# - process: pgsql -# cmdline_grep: postgres -# -# - process: nginx -# cmdline_grep: nginx -# -# - process: app -# cmdline_grep: gunicorn diff --git a/build/packetbeat-win.yml b/build/packetbeat-win.yml deleted file mode 100644 index 143744ded325..000000000000 --- a/build/packetbeat-win.yml +++ /dev/null @@ -1,143 +0,0 @@ -################### Packetbeat Configuration Example ######################### - -# This file contains an overview of various configuration settings. Please consult -# the docs at https://www.elastic.co/guide/en/beats/packetbeat/current/_configuration.html -# for more details. - -# The Packetbeat shipper works by sniffing the network traffic between your -# application components. It inserts meta-data about each transaction into -# Elasticsearch. - -############################# Shipper ############################################ -shipper: - - # The name of the shipper that publishes the network data. It can be used to group - # all the transactions sent by a single shipper in the web interface. - # If this options is not defined, the hostname is used. - name: - - # The tags of the shipper are included in their own field with each - # transaction published. Tags make it easy to group transactions by different - # logical properties. - #tags: ["service1"] - - # Uncomment the following if you want to ignore transactions created - # by the server on which the shipper is installed. This option is useful - # to remove duplicates if shippers are installed on multiple servers. - # ignore_outgoing: true - -############################# Sniffer ############################################ - -# Select the network interfaces to sniff the data. You can use the "any" -# keyword to sniff on all connected interfaces. -interfaces: - device: 1 - - -############################# Protocols ###################################### -protocols: - http: - - # Configure the ports where to listen for HTTP traffic. You can disable - # the http protocol by commenting the list of ports. - ports: [80, 8080, 8000, 5000, 8002] - - # Uncomment the following to hide certain parameters in URL or forms attached - # to HTTP requests. The names of the parameters are case insensitive. - # The value of the parameters will be replaced with the 'xxxxx' string. - # This is generally useful for avoiding storing user passwords or other - # sensitive information. - # Only query parameters and top level form parameters are replaced. - # hide_keywords: ['pass', 'password', 'passwd'] - - mysql: - - # Configure the ports where to listen for MySQL traffic. You can disable - # the MySQL protocol by commenting out the list of ports. - ports: [3306] - - pgsql: - - # Configure the ports where to listen for Pgsql traffic. You can disable - # the Pgsql protocol by commenting out the list of ports. - ports: [5432] - - redis: - - # Configure the ports where to listen for Redis traffic. You can disable - # the Redis protocol by commenting out the list of ports. - ports: [6379] - - thrift: - - # Configure the ports where to listen for Thrift traffic. You can disable - # the Thrift protocol by commenting out the list of ports. - ports: [9090] - - mongodb: - # Configure the ports where to listen for Mongodb traffic. You can disable - # the Mongodb protocol by commenting out the list of ports. - ports: [27017] - -############################# Output ############################################ - -# Configure what outputs to use when sending the data collected by packetbeat. -# You can enable one or multiple outputs by setting enabled option to true. -output: - - # Elasticsearch as output - # Options: - # host, port: where Elasticsearch is listening on - # save_topology: specify if the topology is saved in Elasticsearch - elasticsearch: - enabled: true - hosts: ["localhost:9200"] - save_topology: true - - # Redis as output - # Options: - # host, port: where Redis is listening on - # save_topology: specify if the topology is saved in Redis - #redis: - # enabled: true - # host: localhost - # port: 6379 - # save_topology: true - - # File as output - # Options: - # path: where to save the files - # filename: name of the files - # rotate_every_kb: maximum size of the files in path - # number of files: maximum number of files in path - #file: - # enabled: true - # path: "/tmp/packetbeat" - # filename: packetbeat - # rotate_every_kb: 1000 - # number_of_files: 7 - -############################# Processes ############################################ - -# Configure the processes to be monitored and how to find them. If a process is -# monitored than Packetbeat attempts to use it's name to fill in the `proc` and -# `client_proc` fields. -# The processes can be found by searching their command line by a given string. -# -# Process matching is optional and can be enabled by uncommenting the following -# lines. -# -#procs: -# enabled: false -# monitored: -# - process: mysqld -# cmdline_grep: mysqld -# -# - process: pgsql -# cmdline_grep: postgres -# -# - process: nginx -# cmdline_grep: nginx -# -# - process: app -# cmdline_grep: gunicorn diff --git a/build/packetbeat-win.yml.bk b/build/packetbeat-win.yml.bk deleted file mode 100644 index 53f1c8bfcec3..000000000000 --- a/build/packetbeat-win.yml.bk +++ /dev/null @@ -1,143 +0,0 @@ -################### Packetbeat Configuration Example ######################### - -# This file contains an overview of various configuration settings. Please consult -# the docs at https://www.elastic.co/guide/en/beats/packetbeat/current/_configuration.html -# for more details. - -# The Packetbeat shipper works by sniffing the network traffic between your -# application components. It inserts meta-data about each transaction into -# Elasticsearch. - -############################# Shipper ############################################ -shipper: - - # The name of the shipper that publishes the network data. It can be used to group - # all the transactions sent by a single shipper in the web interface. - # If this options is not defined, the hostname is used. - name: - - # The tags of the shipper are included in their own field with each - # transaction published. Tags make it easy to group transactions by different - # logical properties. - #tags: ["service1"] - - # Uncomment the following if you want to ignore transactions created - # by the server on which the shipper is installed. This option is useful - # to remove duplicates if shippers are installed on multiple servers. - # ignore_outgoing: true - -############################# Sniffer ############################################ - -# Select the network interfaces to sniff the data. You can use the "any" -# keyword to sniff on all connected interfaces. -interfaces: - device: any - - -############################# Protocols ###################################### -protocols: - http: - - # Configure the ports where to listen for HTTP traffic. You can disable - # the http protocol by commenting the list of ports. - ports: [80, 8080, 8000, 5000, 8002] - - # Uncomment the following to hide certain parameters in URL or forms attached - # to HTTP requests. The names of the parameters are case insensitive. - # The value of the parameters will be replaced with the 'xxxxx' string. - # This is generally useful for avoiding storing user passwords or other - # sensitive information. - # Only query parameters and top level form parameters are replaced. - # hide_keywords: ['pass', 'password', 'passwd'] - - mysql: - - # Configure the ports where to listen for MySQL traffic. You can disable - # the MySQL protocol by commenting out the list of ports. - ports: [3306] - - pgsql: - - # Configure the ports where to listen for Pgsql traffic. You can disable - # the Pgsql protocol by commenting out the list of ports. - ports: [5432] - - redis: - - # Configure the ports where to listen for Redis traffic. You can disable - # the Redis protocol by commenting out the list of ports. - ports: [6379] - - thrift: - - # Configure the ports where to listen for Thrift traffic. You can disable - # the Thrift protocol by commenting out the list of ports. - ports: [9090] - - mongodb: - # Configure the ports where to listen for Mongodb traffic. You can disable - # the Mongodb protocol by commenting out the list of ports. - ports: [27017] - -############################# Output ############################################ - -# Configure what outputs to use when sending the data collected by packetbeat. -# You can enable one or multiple outputs by setting enabled option to true. -output: - - # Elasticsearch as output - # Options: - # host, port: where Elasticsearch is listening on - # save_topology: specify if the topology is saved in Elasticsearch - elasticsearch: - enabled: true - hosts: ["localhost:9200"] - save_topology: true - - # Redis as output - # Options: - # host, port: where Redis is listening on - # save_topology: specify if the topology is saved in Redis - #redis: - # enabled: true - # host: localhost - # port: 6379 - # save_topology: true - - # File as output - # Options: - # path: where to save the files - # filename: name of the files - # rotate_every_kb: maximum size of the files in path - # number of files: maximum number of files in path - #file: - # enabled: true - # path: "/tmp/packetbeat" - # filename: packetbeat - # rotate_every_kb: 1000 - # number_of_files: 7 - -############################# Processes ############################################ - -# Configure the processes to be monitored and how to find them. If a process is -# monitored than Packetbeat attempts to use it's name to fill in the `proc` and -# `client_proc` fields. -# The processes can be found by searching their command line by a given string. -# -# Process matching is optional and can be enabled by uncommenting the following -# lines. -# -#procs: -# enabled: false -# monitored: -# - process: mysqld -# cmdline_grep: mysqld -# -# - process: pgsql -# cmdline_grep: postgres -# -# - process: nginx -# cmdline_grep: nginx -# -# - process: app -# cmdline_grep: gunicorn diff --git a/build/packetbeat.template.json b/build/packetbeat.template.json deleted file mode 100644 index 5f176e11b373..000000000000 --- a/build/packetbeat.template.json +++ /dev/null @@ -1,63 +0,0 @@ -{ - "mappings": { - "_default_": { - "_all": { - "enabled": true, - "norms": { - "enabled": false - } - }, - "dynamic_templates": [ - { - "template1": { - "mapping": { - "doc_values": true, - "ignore_above": 1024, - "index": "not_analyzed", - "type": "{dynamic_type}" - }, - "match": "*" - } - } - ], - "properties": { - "client_location": { - "type": "geo_point" - }, - "params": { - "index": "analyzed", - "norms": { - "enabled": false - }, - "type": "string" - }, - "query": { - "doc_values": true, - "index": "not_analyzed", - "type": "string" - }, - "request": { - "index": "analyzed", - "norms": { - "enabled": false - }, - "type": "string" - }, - "response": { - "index": "analyzed", - "norms": { - "enabled": false - }, - "type": "string" - }, - "timestamp": { - "type": "date" - } - } - } - }, - "settings": { - "index.refresh_interval": "5s" - }, - "template": "packetbeat-*" -} \ No newline at end of file From 408a71caca91db14bf7bb8fce697a9862b5e5b4d Mon Sep 17 00:00:00 2001 From: Tudor Golubenco Date: Thu, 17 Sep 2015 10:18:49 +0200 Subject: [PATCH 2/2] Added build/ to .gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 590c8d5ba17f..df7388b22a88 100644 --- a/.gitignore +++ b/.gitignore @@ -12,6 +12,7 @@ packetbeat.test /coverage/ /docs/html_docs +/build/ # Folders _obj