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

Release php_fpm Metricbeat module as GA #10198

Merged
merged 2 commits into from
Jan 21, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
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
1 change: 1 addition & 0 deletions CHANGELOG.next.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
- Add AWS EC2 module. {pull}9257[9257] {issue}9300[9300]
- Release traefik Metricbeat module as GA. {pull}10166[10166]
- Release Elastic stack modules (Elasticsearch, Logstash, and Kibana) as GA. {pull}10094[10094]
- Release php_fpm module as GA. {pull}10198[10198]
- Release Memcached module as GA. {pull}10199[10199]
- Release etcd module as GA. {pull}10200[10200]
- Release Ceph module as GA. {pull}10202[10202]
Expand Down
1 change: 0 additions & 1 deletion metricbeat/docs/fields.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -17644,7 +17644,6 @@ The current number of idle client connections waiting for a request.
[[exported-fields-php_fpm]]
== PHP_FPM fields

beta[]
PHP-FPM server status metrics collected from PHP-FPM.


Expand Down
2 changes: 0 additions & 2 deletions metricbeat/docs/modules/php_fpm.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@ This file is generated! See scripts/docs_collector.py
[[metricbeat-module-php_fpm]]
== PHP_FPM module

beta[]

This module periodically fetches metrics from https://php-fpm.org[PHP-FPM]
servers.

Expand Down
2 changes: 0 additions & 2 deletions metricbeat/docs/modules/php_fpm/pool.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@ This file is generated! See scripts/docs_collector.py
[[metricbeat-metricset-php_fpm-pool]]
=== PHP_FPM pool metricset

beta[]

include::../../../module/php_fpm/pool/_meta/docs.asciidoc[]


Expand Down
2 changes: 0 additions & 2 deletions metricbeat/docs/modules/php_fpm/process.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@ This file is generated! See scripts/docs_collector.py
[[metricbeat-metricset-php_fpm-process]]
=== PHP_FPM process metricset

beta[]

include::../../../module/php_fpm/process/_meta/docs.asciidoc[]


Expand Down
6 changes: 3 additions & 3 deletions metricbeat/docs/modules_list.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -107,9 +107,9 @@ This file is generated! See scripts/docs_collector.py
|<<metricbeat-metricset-nats-stats,stats>> experimental[]
|<<metricbeat-module-nginx,Nginx>> |image:./images/icon-yes.png[Prebuilt dashboards are available] |
.1+| .1+| |<<metricbeat-metricset-nginx-stubstatus,stubstatus>>
|<<metricbeat-module-php_fpm,PHP_FPM>> beta[] |image:./images/icon-no.png[No prebuilt dashboards] |
.2+| .2+| |<<metricbeat-metricset-php_fpm-pool,pool>> beta[]
|<<metricbeat-metricset-php_fpm-process,process>> beta[]
|<<metricbeat-module-php_fpm,PHP_FPM>> |image:./images/icon-no.png[No prebuilt dashboards] |
.2+| .2+| |<<metricbeat-metricset-php_fpm-pool,pool>>
|<<metricbeat-metricset-php_fpm-process,process>>
|<<metricbeat-module-postgresql,PostgreSQL>> |image:./images/icon-no.png[No prebuilt dashboards] |
.4+| .4+| |<<metricbeat-metricset-postgresql-activity,activity>>
|<<metricbeat-metricset-postgresql-bgwriter,bgwriter>>
Expand Down
5 changes: 1 addition & 4 deletions metricbeat/module/php_fpm/_meta/fields.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
- key: php_fpm
title: "PHP_FPM"
description: >
beta[]

PHP-FPM server status metrics collected from PHP-FPM.
short_config: false
release: beta
release: ga
settings: ["ssl", "http"]
fields:
- name: php_fpm
Expand All @@ -18,7 +16,6 @@
type: group
description: >
`pool` contains the metrics that were obtained from the PHP-FPM process pool.
release: beta
fields:
- name: name
type: keyword
Expand Down
2 changes: 1 addition & 1 deletion metricbeat/module/php_fpm/fields.go

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

2 changes: 1 addition & 1 deletion metricbeat/module/php_fpm/pool/_meta/fields.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
description: >
`pool` contains the metrics that were obtained from the PHP-FPM process
pool.
release: beta
release: ga
fields:
- name: process_manager
type: keyword
Expand Down
2 changes: 0 additions & 2 deletions metricbeat/module/php_fpm/pool/pool.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ package pool
import (
"encoding/json"

"github.com/elastic/beats/libbeat/common/cfgwarn"
"github.com/elastic/beats/metricbeat/helper"
"github.com/elastic/beats/metricbeat/mb"
"github.com/elastic/beats/metricbeat/module/php_fpm"
Expand All @@ -42,7 +41,6 @@ type MetricSet struct {

// New create a new instance of the MetricSet
func New(base mb.BaseMetricSet) (mb.MetricSet, error) {
cfgwarn.Beta("The php_fpm pool metricset is beta")
http, err := helper.NewHTTP(base)
if err != nil {
return nil, err
Expand Down
2 changes: 1 addition & 1 deletion metricbeat/module/php_fpm/process/_meta/fields.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
type: group
description: >
process contains the metrics that were obtained from the PHP-FPM process.
release: beta
release: ga
fields:
- name: pid
type: integer
Expand Down
2 changes: 0 additions & 2 deletions metricbeat/module/php_fpm/process/process.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ package process
import (
"net/url"

"github.com/elastic/beats/libbeat/common/cfgwarn"
"github.com/elastic/beats/metricbeat/helper"
"github.com/elastic/beats/metricbeat/mb"
"github.com/elastic/beats/metricbeat/mb/parse"
Expand All @@ -47,7 +46,6 @@ type MetricSet struct {
// New creates a new instance of the MetricSet. New is responsible for unpacking
// any MetricSet specific configuration options if there are any.
func New(base mb.BaseMetricSet) (mb.MetricSet, error) {
cfgwarn.Beta("The php_fpm process metricset is beta")
http, err := helper.NewHTTP(base)
if err != nil {
return nil, err
Expand Down