diff --git a/collector/dfsr.go b/collector/dfsr.go index 81e76cc8..ef438ee3 100644 --- a/collector/dfsr.go +++ b/collector/dfsr.go @@ -129,7 +129,7 @@ func NewDFSRCollector() (Collector, error) { ConnectionFilesReceivedTotal: prometheus.NewDesc( prometheus.BuildFQName(Namespace, subsystem, "connection_received_files_total"), - "Total number of files receieved for connection", + "Total number of files received for connection", []string{"name"}, nil, ), diff --git a/collector/dns.go b/collector/dns.go index e7f3a5cb..037766a2 100644 --- a/collector/dns.go +++ b/collector/dns.go @@ -137,7 +137,7 @@ func NewDNSCollector() (Collector, error) { ), Responses: prometheus.NewDesc( prometheus.BuildFQName(Namespace, subsystem, "responses_total"), - "Number of reponses sent by DNS server", + "Number of responses sent by DNS server", []string{"protocol"}, nil, ), diff --git a/collector/exchange.go b/collector/exchange.go index 1362a1b6..25b0354d 100644 --- a/collector/exchange.go +++ b/collector/exchange.go @@ -235,7 +235,7 @@ func (c *exchangeCollector) collectADAccessProcesses(ctx *ScrapeContext, ch chan } // since we're not including the PID suffix from the instance names in the label names, - // we get an occational duplicate. This seems to affect about 4 instances only on this object. + // we get an occasional duplicate. This seems to affect about 4 instances only on this object. labelUseCount[labelName]++ if labelUseCount[labelName] > 1 { labelName = fmt.Sprintf("%s_%d", labelName, labelUseCount[labelName]) diff --git a/collector/mssql.go b/collector/mssql.go index 47eecf8e..d8430e01 100644 --- a/collector/mssql.go +++ b/collector/mssql.go @@ -1958,7 +1958,7 @@ func (c *MSSQLCollector) Collect(ctx *ScrapeContext, ch chan<- prometheus.Metric } wg.Wait() - // this shoud return an error if any? some? children errord. + // this should return an error if any? some? children errord. if c.mssqlChildCollectorFailure > 0 { return errors.New("at least one child collector failed") } diff --git a/collector/process.go b/collector/process.go index a406301c..30fdf50a 100644 --- a/collector/process.go +++ b/collector/process.go @@ -134,7 +134,7 @@ func newProcessCollector() (Collector, error) { ), WorkingSetPrivate: prometheus.NewDesc( prometheus.BuildFQName(Namespace, subsystem, "working_set_private_bytes"), - "Size of the working set, in bytes, that is use for this process only and not shared nor sharable by other processes.", + "Size of the working set, in bytes, that is use for this process only and not shared nor shareable by other processes.", []string{"process", "process_id", "creating_process_id"}, nil, ), diff --git a/collector/remote_fx.go b/collector/remote_fx.go index 7725e852..25be2f35 100644 --- a/collector/remote_fx.go +++ b/collector/remote_fx.go @@ -61,7 +61,7 @@ func NewRemoteFx() (Collector, error) { ), CurrentTCPBandwidth: prometheus.NewDesc( prometheus.BuildFQName(Namespace, subsystem, "net_current_tcp_bandwidth"), - "TCP Bandwidth detected in bytes per seccond.", + "TCP Bandwidth detected in bytes per second.", []string{"session_name"}, nil, ), diff --git a/docs/collector.dfsr.md b/docs/collector.dfsr.md index 429a97a6..7893d5ce 100644 --- a/docs/collector.dfsr.md +++ b/docs/collector.dfsr.md @@ -44,7 +44,7 @@ Name | Description | Type | Labels `windows_dfsr_folder_deleted_bytes_cleaned_up_total` | Total size (in bytes) of replicating deleted files and folders that were cleaned up from the Conflict and Deleted folder. | gauge | name `windows_dfsr_folder_deleted_bytes_generated_total` | Total size (in bytes) of replicated deleted files and folders that were moved to the Conflict and Deleted folder after they were deleted from a replicated folder on a sending member. | counter | name `windows_dfsr_folder_deleted_files_cleaned_up_total` | Number of files and folders that were cleaned up from the Conflict and Deleted folder. | counter | name -`windows_dfsr_folder_deleted_files_generated_total` | Number of deleted fils and folders that were moved to the Conflict and Deleted folder. | counter | name +`windows_dfsr_folder_deleted_files_generated_total` | Number of deleted files and folders that were moved to the Conflict and Deleted folder. | counter | name `windows_dfsr_folder_file_installs_retried_total` | Total number of file installs that are being retried due to sharing violations or other errors encountered when installing the files. The DFS Replication service replicates staged files into a staging folder, uncompresses them in the Installing folder, and renames them to the target location. The second and third steps of this process are known as installing the file. | counter | name `windows_dfsr_folder_file_installs_succeeded_total` | Total number of files that were successfully received from sending members and installed locally on this server. The DFS Replication service replicates staged files into a staging folder, uncompresses them in the Installing folder, and renames them to the target location. The second and third steps of this process are known as installing the file. | counter | name `windows_dfsr_folder_files_received_total` | Total number of files received. | counter | name diff --git a/docs/collector.exchange.md b/docs/collector.exchange.md index 6fddbc08..09510e49 100644 --- a/docs/collector.exchange.md +++ b/docs/collector.exchange.md @@ -36,7 +36,7 @@ Name | Description `windows_exchange_transport_queues_internal_active_remote_delivery` | Internal Active Remote Delivery Queue length `windows_exchange_transport_queues_active_mailbox_delivery` | Active Mailbox Delivery Queue length `windows_exchange_transport_queues_retry_mailbox_delivery` | Retry Mailbox Delivery Queue length -`windows_exchange_transport_queues_unreachable` | Unreachable Queue lengt +`windows_exchange_transport_queues_unreachable` | Unreachable Queue length `windows_exchange_transport_queues_external_largest_delivery` | External Largest Delivery Queue length `windows_exchange_transport_queues_internal_largest_delivery` | Internal Largest Delivery Queue length `windows_exchange_transport_queues_poison` | Poison Queue length diff --git a/docs/collector.fsrmquota.md b/docs/collector.fsrmquota.md index 5d6c60e0..1a7eb0cd 100644 --- a/docs/collector.fsrmquota.md +++ b/docs/collector.fsrmquota.md @@ -1,6 +1,6 @@ # Microsoft File Server Resource Manager (FSRM) Quotas collector -The fsrmquota collector exposes metrics about File Server Ressource Manager Quotas. Note that this collector has only been tested against Windows server 2012R2. +The fsrmquota collector exposes metrics about File Server Resource Manager Quotas. Note that this collector has only been tested against Windows server 2012R2. Other FSRM versions may work but are not tested. ||| @@ -48,5 +48,5 @@ rate(windows_fsrmquota_usage_bytes)[1d] severity: "high" annotations: summary: "High Quotas Usage" - description: "High use of File Ressource.\n Quotas: {{ $labels.path }}\n Current use : {{ $value }}" + description: "High use of File Resource.\n Quotas: {{ $labels.path }}\n Current use : {{ $value }}" ``` diff --git a/docs/collector.os.md b/docs/collector.os.md index 3993e103..74689fd0 100644 --- a/docs/collector.os.md +++ b/docs/collector.os.md @@ -17,7 +17,7 @@ None Name | Description | Type | Labels -----|-------------|------|------- `windows_os_info` | Contains full product name & version in labels | gauge | `product`, `version` -`windows_os_paging_limit_bytes` | Total number of bytes that can be sotred in the operating system paging files. 0 (zero) indicates that there are no paging files | gauge | None +`windows_os_paging_limit_bytes` | Total number of bytes that can be stored in the operating system paging files. 0 (zero) indicates that there are no paging files | gauge | None `windows_os_paging_free_bytes` | Number of bytes that can be mapped into the operating system paging files without causing any other pages to be swapped out | gauge | None `windows_os_physical_memory_free_bytes` | Bytes of physical memory currently unused and available | gauge | None `windows_os_time` | Current time as reported by the operating system, in [Unix time](https://en.wikipedia.org/wiki/Unix_time). See [time.Unix()](https://golang.org/pkg/time/#Unix) for details | gauge | None diff --git a/docs/collector.process.md b/docs/collector.process.md index 9a98b7d2..3501f872 100644 --- a/docs/collector.process.md +++ b/docs/collector.process.md @@ -53,7 +53,7 @@ Name | Description | Type | Labels `windows_process_private_bytes` | Current number of bytes this process has allocated that cannot be shared with other processes. | gauge | `process`, `process_id`, `creating_process_id` `windows_process_thread_count` | Number of threads currently active in this process. An instruction is the basic unit of execution in a processor, and a thread is the object that executes instructions. Every running process has at least one thread. | gauge | `process`, `process_id`, `creating_process_id` `windows_process_virtual_bytes` | Current size, in bytes, of the virtual address space that the process is using. Use of virtual address space does not necessarily imply corresponding use of either disk or main memory pages. Virtual space is finite and, by using too much, the process can limit its ability to load libraries. | gauge | `process`, `process_id`, `creating_process_id` -`windows_process_working_set_private_bytes` | Size of the working set, in bytes, that is use for this process only and not shared nor sharable by other processes. | gauge | `process`, `process_id`, `creating_process_id` +`windows_process_working_set_private_bytes` | Size of the working set, in bytes, that is use for this process only and not shared nor shareable by other processes. | gauge | `process`, `process_id`, `creating_process_id` `windows_process_working_set_peak_bytes` | Maximum size, in bytes, of the Working Set of this process at any point in time. The Working Set is the set of memory pages touched recently by the threads in the process. If free memory in the computer is above a threshold, pages are left in the Working Set of a process even if they are not in use. When free memory falls below a threshold, pages are trimmed from Working Sets. If they are needed they will then be soft-faulted back into the Working Set before they leave main memory. | gauge | `process`, `process_id`, `creating_process_id` `windows_process_working_set_bytes` | Maximum number of bytes in the working set of this process at any point in time. The working set is the set of memory pages touched recently by the threads in the process. If free memory in the computer is above a threshold, pages are left in the working set of a process even if they are not in use. When free memory falls below a threshold, pages are trimmed from working sets. If they are needed, they are then soft-faulted back into the working set before they leave main memory. | gauge | `process`, `process_id`, `creating_process_id` diff --git a/docs/collector.smtp.md b/docs/collector.smtp.md index c3745c78..f35be89d 100644 --- a/docs/collector.smtp.md +++ b/docs/collector.smtp.md @@ -24,7 +24,7 @@ If given, a virtual SMTP server needs to *not* match the blacklist regexp in ord Name | Description | Type | Labels -----|-------------|------|------- -`windows_smtp_badmailed_messages_bad_pickup_file_total` | Total number of mailformed pickup messages sent to badmail | counter | `server` +`windows_smtp_badmailed_messages_bad_pickup_file_total` | Total number of malformed pickup messages sent to badmail | counter | `server` `windows_smtp_badmailed_messages_general_failure_total` | Total number of messages sent to badmail for reasons not associated with a specific counter | counter | `server` `windows_smtp_badmailed_messages_hop_count_exceeded_total` | Total number of messages sent to badmail because they had exceeded the maximum hop count | counter | `server` `windows_smtp_badmailed_messages_ndr_of_dns_total` | Total number of Delivery Status Notifications sent to badmail because they could not be delivered | counter | `server` diff --git a/exporter.go b/exporter.go index 2b3d42c0..adf048b3 100644 --- a/exporter.go +++ b/exporter.go @@ -259,7 +259,7 @@ func main() { var ( configFile = kingpin.Flag( "config.file", - "YAML configuration file to use. Values set in this file will be overriden by CLI flags.", + "YAML configuration file to use. Values set in this file will be overridden by CLI flags.", ).String() webConfig = webflag.AddFlags(kingpin.CommandLine) listenAddress = kingpin.Flag(