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

Fix typos #1367

Merged
merged 1 commit into from
Sep 14, 2017
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
2 changes: 1 addition & 1 deletion controllers/nginx/pkg/metric/collector/nginx.go
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ func (p nginxStatusCollector) Stop() {
close(p.scrapeChan)
}

// nginxStatusCollector scrap the nginx status
// nginxStatusCollector scrape the nginx status
func (p nginxStatusCollector) scrape(ch chan<- prometheus.Metric) {
s, err := getNginxStatus(p.ngxHealthPort, p.ngxVtsPath)
if err != nil {
Expand Down
6 changes: 3 additions & 3 deletions controllers/nginx/pkg/metric/collector/status.go
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ func (bit BoolToFloat64) UnmarshalJSON(data []byte) error {

func getNginxStatus(port int, path string) (*basicStatus, error) {
url := fmt.Sprintf("http://localhost:%v%v", port, path)
glog.V(3).Infof("start scrapping url: %v", url)
glog.V(3).Infof("start scraping url: %v", url)

data, err := httpBody(url)

Expand Down Expand Up @@ -176,7 +176,7 @@ func httpBody(url string) ([]byte, error) {

func getNginxVtsMetrics(port int, path string) (*vts, error) {
url := fmt.Sprintf("http://localhost:%v%v", port, path)
glog.V(3).Infof("start scrapping url: %v", url)
glog.V(3).Infof("start scraping url: %v", url)

data, err := httpBody(url)

Expand All @@ -189,7 +189,7 @@ func getNginxVtsMetrics(port int, path string) (*vts, error) {
if err != nil {
return nil, fmt.Errorf("unexpected error json unmarshal (%v)", err)
}
glog.V(3).Infof("scrap returned : %v", vts)
glog.V(3).Infof("scrape returned : %v", vts)
return vts, nil
}

Expand Down
2 changes: 1 addition & 1 deletion examples/customization/custom-vts-metrics/nginx/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
This example aims to demonstrate the deployment of an nginx ingress controller and
use a ConfigMap to enable nginx vts module and export metrics for prometheus,to enable
vts metric,you can simply run `kubectl apply -f nginx`,a deployment and service will be
created which already has a `prometheus.io/scrap: 'true'` annotation and if you added
created which already has a `prometheus.io/scrape: 'true'` annotation and if you added
the recommended Prometheus service-endpoint scraping [configuration](https://github.com/raw/prometheus/prometheus/master/documentation/examples/prometheus-kubernetes.yml),
Prometheus will scrape it automatically and you start using the generated metrics right away.

Expand Down