diff --git a/docker-compose.yml b/docker-compose.yml index b1d6855a3a..63c6ff936b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -131,13 +131,6 @@ services: - "127.0.0.1:${FLEET_SAML_IDP_HTTP_PORT:-9080}:8080" - "127.0.0.1:${FLEET_SAML_IDP_HTTPS_PORT:-9443}:8443" - prometheus: - image: prom/prometheus:latest - ports: - - "127.0.0.1:${FLEET_PROMETHEUS_PORT:-9090}:9090" - volumes: - - ./tools/app/prometheus.yml:/etc/prometheus/prometheus.yml - # localstack to simulate AWS integrations like firehose & kinesis # use http://localhost:4566 as the `--endpoint-url` argument in awscli localstack: diff --git a/handbook/company/writing.md b/handbook/company/writing.md index d94f6ec5e2..91c1534145 100644 --- a/handbook/company/writing.md +++ b/handbook/company/writing.md @@ -88,7 +88,7 @@ Case study articles use a separate article template that requires additional `` tags: - `useBasicArticleTemplate` - Whether or not the case study should use the standard article template or the non-anonymous case study template. **Note:** if this meta tag is set, the case study specific meta tags below are not required. - `summaryChallenge` - The challenge this case study subject faced before they started using Fleet. Used in the case study summary on the non-anonymous case study template page. - - `summarySolution` - How Fleet helped the case study subject acomplish their goals. Used in the case study summary on the non-anonymous case study template page. + - `summarySolution` - How Fleet helped the case study subject accomplish their goals. Used in the case study summary on the non-anonymous case study template page. - `summaryKeyResults` - A semicolon-separated list of results that the case study subject saw after using Fleet. Each item in the list is added a bullet point to the case study summary on the non-anonymous case study template page. - Optional `` tags: - `companyLogoFilename` - The filename of the case study subject's logo in the `website/assets/images/` folder. **Note:** images for this value are not stored in the articles folder, because they may be used outside of articles (e.g., Testimonial cards on landing pages) @@ -205,10 +205,10 @@ handbook/..."_). Navigate to the file's location on GitHub, and press "y" to tra For instance when a broken link is discovered on fleetdm.com, always check if the link is a relative link to a location outside of `/docs`. An example of a link that lives outside of `/docs` is: ``` -../../tools/app/prometheus +../../tools/saml/config.php ``` -If the link lives outside `/docs`, head to the file's location (in this case, [https://github.com/fleetdm/fleet/blob/main/tools/app/prometheus.yml)](https://github.com/fleetdm/fleet/blob/main/tools/app/prometheus.yml)), and copy the full URL into its canonical form (a version of the link that will always point to the same location) ([https://github.com/fleetdm/fleet/blob/194ad5963b0d55bdf976aa93f3de6cabd590c97a/tools/app/prometheus.yml](https://github.com/fleetdm/fleet/blob/194ad5963b0d55bdf976aa93f3de6cabd590c97a/tools/app/prometheus.yml)). Replace the relative link with full URL. +If the link lives outside `/docs`, head to the file's location (in this case, [https://github.com/fleetdm/fleet/blob/main/tools/saml/config.php](https://github.com/fleetdm/fleet/blob/main/tools/saml/config.php)), and copy the full URL into its canonical form (a version of the link that will always point to the same location) ([https://github.com/fleetdm/fleet/blob/0504e5949ec718cdd5b4081a2c650c081faa1214/tools/saml/config.php](https://github.com/fleetdm/fleet/blob/0504e5949ec718cdd5b4081a2c650c081faa1214/tools/saml/config.php)). Replace the relative link with full URL. ## Making a pull request @@ -947,7 +947,7 @@ To add a quote blockquote, add a `
` HTML element with `purpose="quot
This is a quote blockquote. -Lines seperated by a blank newline will be rendered on a different line in the blockquote. +Lines separated by a blank newline will be rendered on a different line in the blockquote.
``` @@ -956,7 +956,7 @@ Lines seperated by a blank newline will be rendered on a different line in the b
This is a quote blockquote. -Lines seperated by a blank newline will be rendered on a different line in the blockquote. +Lines separated by a blank newline will be rendered on a different line in the blockquote.
diff --git a/tools/README.md b/tools/README.md index 48ce32dd5a..9661297458 100644 --- a/tools/README.md +++ b/tools/README.md @@ -230,7 +230,6 @@ go run ./tools/run-scripts -scripts-disabled -content 'echo "Test"' | `redis-tests/` | Redis testing configs | ElastiCache and general Redis test configs | | `snapshot/` | Database snapshot/restore tool | `go run ./tools/snapshot s` or `go run ./tools/snapshot r` | | **Development Tools** | | | -| `app/` | Prometheus config for local dev | See `prometheus.yml` | | `ci/` | CI helper tools (golangci-lint rules) | `rules.go` - ruleguard custom linting rules | | `desktop/` | Fleet Desktop development tool | `go run ./tools/desktop` - builds Desktop app | | `dialog/` | Test zenity/kdialog dialogs on Linux | `go run ./tools/dialog -dialog zenity` | diff --git a/tools/app/prometheus.yml b/tools/app/prometheus.yml deleted file mode 100644 index 7b07381822..0000000000 --- a/tools/app/prometheus.yml +++ /dev/null @@ -1,11 +0,0 @@ -scrape_configs: - - job_name: fleet - scheme: https - scrape_interval: 5s - static_configs: - - targets: ['host.docker.internal:8080'] - tls_config: - insecure_skip_verify: true - basic_auth: - username: fleet - password: insecure