Skip to content

Commit

Permalink
Fix misspelled words in comments and error messages (DataDog#2152)
Browse files Browse the repository at this point in the history
  • Loading branch information
seratch authored and mfpierre committed Aug 13, 2018
1 parent 3e650aa commit db52078
Show file tree
Hide file tree
Showing 17 changed files with 24 additions and 24 deletions.
6 changes: 3 additions & 3 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -463,7 +463,7 @@ Bug Fixes
- Fixes JMXFetch on Windows when the ``custom_jar_paths`` and/or ``tools_jar_path`` options are set,
by using a semicolon as the path separator on Windows.

- Prevent an empty response body from being marked as a "successfull call to the GCE metadata api".
- Prevent an empty response body from being marked as a "successful call to the GCE metadata api".
Fixes a bug where hostnames became an empty string when using docker swarm and a non GCE environment.

- Config option specified in `syslog_pem` if syslog logging is enabled with
Expand Down Expand Up @@ -844,7 +844,7 @@ Bug Fixes
line to be set in the registry, where they'll be translated to the
configuration

- Accept now short names for docker image in logs configuration file and added to the possibilty to filter containers by image name with Kubernetes.
- Accept now short names for docker image in logs configuration file and added to the possibility to filter containers by image name with Kubernetes.

- Fixes an issue that would prevent the agent from stopping when it was tailing logs
of a container that had no logs.
Expand Down Expand Up @@ -1385,7 +1385,7 @@ New Features

- Set the default "procfs_path" configuration to `/host/proc` when containerized
to allow the network check to collect the host's network metrics. This can be
overriden with the the DD_PROCFS_PATH envvar.
overridden with the the DD_PROCFS_PATH envvar.

- Series for a common metric name will no longer be split among multiple
transactions/payload. This guarantee that every point for a time T and a metric
Expand Down
2 changes: 1 addition & 1 deletion Dockerfiles/agent/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ Some options are not yet available as environment variable bindings. To customiz

### Optional volumes

To run custom checks and configurations without buidling your own image, you can mount additional files in these folders:
To run custom checks and configurations without building your own image, you can mount additional files in these folders:

- `/checks.d/` : custom checks in this folder will be copied over and used, if a corresponding configuration is found
- `/conf.d/` : check configurations and Autodiscovery templates in this folder will be copied over in the agent's configuration folder. You can mount a host folder, kubernetes configmaps, or other volumes. **Note:** autodiscovery templates now are directly stored in the main `conf.d` folder, not in an `auto_conf` subfolder.
Expand Down
2 changes: 1 addition & 1 deletion Dockerfiles/agent/SUPERVISION.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ The supported way to pass envvars to the agent is to set container envvars.
The image starts three services:

- `agent` is the main agent. The container will exit if it stops.
- `trace-agent` and `process-agent` are auxilary services. They will be
- `trace-agent` and `process-agent` are auxiliary services. They will be
restarted after crashing, but not if exiting normally (for example, the
`trace-agent` will disable itself if `DD_APM_ENABLED` is false).

Expand Down
2 changes: 1 addition & 1 deletion cmd/agent/gui/views/private/js/javascript.js
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ function setupHomePage() {
$("#hostname").append(JSON.stringify(data))
});

// Regularily check if agent is running
// Regularly check if agent is running
setInterval(checkStatus, 2000);
}

Expand Down
4 changes: 2 additions & 2 deletions cmd/agent/gui/views/private/js/yaml.js
Original file line number Diff line number Diff line change
Expand Up @@ -57,12 +57,12 @@ CodeMirror.defineMode("yaml", function() {
return 'meta';
}

/* list seperator */
/* list separator */
if (state.inlineList > 0 && !esc && ch == ',') {
stream.next();
return 'meta';
}
/* pairs seperator */
/* pairs separator */
if (state.inlinePairs > 0 && !esc && ch == ',') {
state.keyCol = 0;
state.pair = false;
Expand Down
6 changes: 3 additions & 3 deletions docs/agent/changes.md
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,7 @@ apm_config:
For the Docker image, the APM agent is disabled by default. You can enable it by setting
the `DD_APM_ENABLED` envvar to `true`. It will listen to all interfaces by default.

If you want to listen to non-local trafic on any other platform, you can set
If you want to listen to non-local traffic on any other platform, you can set
`apm_config.apm_non_local_traffic = true` in your `datadog.yaml`.

## Process agent
Expand Down Expand Up @@ -314,7 +314,7 @@ are ported, excepted the following deprecations:
* `collect_labels_as_tags` has been renamed `docker_labels_as_tags` and now
supports high cardinality tags, see the details in `datadog.yaml.example`
* `exclude` and `include` lists have been renamed `ac_include` and
`ac_exclude`. In order to make filtering consistent accross all components of
`ac_exclude`. In order to make filtering consistent across all components of
the agent, we had to drop filtering on arbitrary tags. The only supported
filtering tags are `image` (image name) and `name` (container name).
Regexp filtering is still available, see `datadog.yaml.example` for examples
Expand Down Expand Up @@ -373,7 +373,7 @@ All documented use cases are supported, please contact our support team if you r

### Kubernetes

When using Kubernetes, the Autodiscovery system now sources information from the kubelet, instead of the Docker daemon. This will allow AD to work without access to the Docker socket, and enable a more consistent experience accross all parts of the agent. Also, the default behaviour is to source AD templates from pod annotations. You can enable the `docker` config-provider to use container labels, and replace the `kubelet` listener by the `kubelet` one if you need AD on containers running out of pods.
When using Kubernetes, the Autodiscovery system now sources information from the kubelet, instead of the Docker daemon. This will allow AD to work without access to the Docker socket, and enable a more consistent experience across all parts of the agent. Also, the default behaviour is to source AD templates from pod annotations. You can enable the `docker` config-provider to use container labels, and replace the `kubelet` listener by the `kubelet` one if you need AD on containers running out of pods.

When specifying AD templates in pod annotations, the new annotation name prefix is `ad.datadoghq.com/`. the previous annotation prefix
`service-discovery.datadoghq.com/` is still supported for Agent6 but support will be removed in Agent7.
Expand Down
2 changes: 1 addition & 1 deletion docs/dev/caveats.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ This document provides a list of known development caveats
## Windows

The COM concurrency model may be set in different ways, it also has to be called for every thread that might indeed interact with the COM library. Furthermore, once a concurrency model is set for a thread, it cannot be changed unless the thread is `CoUnitilialize()`d. This poses an issue for us for a variety of reasons:
1. We use thirdparty libraries like `gopsutil` that initialize the concurrency model setting it to the multi-threaded model - the libary will fail in its calls if the model is any different.
1. We use thirdparty libraries like `gopsutil` that initialize the concurrency model setting it to the multi-threaded model - the library will fail in its calls if the model is any different.
2. We also have python integrations that employ the COM library (ie. WMI, SQLserver, ...) that ultimately rely on `pythoncom` for this. `pythoncom`, in fact, initializes the COM library to the single-threaded model by default, but doesn't really care about the concurrency model and will not fail if a different model has been previously set.
3. Because the actual *loading* of the integrations will import `pythoncom` the concurrency model might be inadvertedly and implicitly be set to the default (single-threaded) concurrency model meaning that any subsequent call to an affected `gopsutil` function would fail as the concurrency model would already be set.
4. Due to go's concurrency model we can assume nothing about what goroutine is running on what thread at any given time, so it's not trivial to tell what concurrency model a thread's COM library was initialized to.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
---
fixes:
- |
Accept now short names for docker image in logs configuration file and added to the possibilty to filter containers by image name with Kubernetes.
Accept now short names for docker image in logs configuration file and added to the possibility to filter containers by image name with Kubernetes.
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ features:
- |
Set the default "procfs_path" configuration to `/host/proc` when containerized
to allow the network check to collect the host's network metrics. This can be
overriden with the the DD_PROCFS_PATH envvar.
overridden with the the DD_PROCFS_PATH envvar.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
fixes:
- |
Prevent an empty response body from being marked as a "successfull call to the GCE metadata api".
Prevent an empty response body from being marked as a "successful call to the GCE metadata api".
Fixes a bug where hostnames became an empty string when using docker swarm and a non GCE environment.
2 changes: 1 addition & 1 deletion tasks/agent.py
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ def build(ctx, rebuild=False, race=False, build_include=None, build_exclude=None
if ex not in build_exclude:
build_exclude.append(ex)

# remove all tags that are only availaible on debian distributions
# remove all tags that are only available on debian distributions
distname = platform.linux_distribution()[0].lower()
if distname not in ['debian', 'ubuntu']:
for ex in DEBIAN_ONLY_TAGS:
Expand Down
4 changes: 2 additions & 2 deletions tasks/android.py
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ def build(ctx, rebuild=False, race=False, build_include=None, build_exclude=None
if ex not in build_exclude:
build_exclude.append(ex)

# remove all tags that are only availaible on debian distributions
# remove all tags that are only available on debian distributions
distname = platform.linux_distribution()[0].lower()
if distname not in ['debian', 'ubuntu']:
for ex in DEBIAN_ONLY_TAGS:
Expand Down Expand Up @@ -178,4 +178,4 @@ def launchservice(ctx, api_key, hostname=None, tags=None):
@task
def stopservice(ctx):
cmd = "adb shell am force-stop org.datadog.agent"
ctx.run(cmd)
ctx.run(cmd)
2 changes: 1 addition & 1 deletion tasks/build_tags.py
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ def get_default_build_tags(puppy=False):
include = ["all"]
exclude = [] if sys.platform.startswith('linux') else LINUX_ONLY_TAGS

# remove all tags that are only availaible on debian distributions
# remove all tags that are only available on debian distributions
distname = platform.linux_distribution()[0].lower()
if distname not in ['debian', 'ubuntu']:
exclude = exclude + DEBIAN_ONLY_TAGS
Expand Down
4 changes: 2 additions & 2 deletions tasks/release.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,11 @@ def update_changelog(ctx, new_version):
print("Error: invalid version: {}".format(new_version_int))
raise Exit(1)

# let's avoid loosing uncommited change with 'git reset --hard'
# let's avoid loosing uncommitted change with 'git reset --hard'
try:
ctx.run("git diff --exit-code HEAD", hide="both")
except Failure as e:
print("Error: You have uncommited change, please commit or stash before using update_changelog")
print("Error: You have uncommitted change, please commit or stash before using update_changelog")
return

# make sure we are up to date
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/containers/fake_datadog/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ db.series.aggregate([
])
```

Count tag occurences on a given metric:
Count tag occurrences on a given metric:
```js
db.series.aggregate([
{ $match: { metric: "kubernetes.filesystem.usage", tags: { $all: ["pod_name:fake-app-datadog-7cfb79db4d-dd4jr"] } } },
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

instances:
# for every instance a 'rabbitmq_api_url' must be provided, pointing to the api
# url of the RabbitMQ Managment Plugin (http://www.rabbitmq.com/management.html)
# url of the RabbitMQ Management Plugin (http://www.rabbitmq.com/management.html)
# optional: 'rabbitmq_user' (default: guest), 'rabbitmq_pass' (default: guest), 'ssl_verify' (default: true) and 'tag_families' (default: false)
<% @instances.each do |i| -%>
- rabbitmq_api_url: <%= i['api_url'] %>
Expand Down
2 changes: 1 addition & 1 deletion test/kitchen/site-cookbooks/dd-agent-upgrade/README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# dd-agent-upgrade cookbook

Updates an installed Agent to the latest version (default), or the version
specifed in `version`. You can also add a new repository by setting the
specified in `version`. You can also add a new repository by setting the
`add_new_repo` flag to `true` and passing an `aptrepo` and/or a `yumrepo`. This
is useful when you want to use the `dd-agent` recipe to install the latest
release, and then use this repository to add the candidate repository and
Expand Down

0 comments on commit db52078

Please sign in to comment.