Skip to content

Commit

Permalink
Prep initial charts indexing (#14)
Browse files Browse the repository at this point in the history
* [stable/prometheus] update prometheus to 2.20.1 and cm reloader to 0.4.0 (#23506)

* updated prometheus to 2.20.1 and cm reloader to 0.4.0

Signed-off-by: André Bauer <[email protected]>

* fix xpp version

Signed-off-by: André Bauer <[email protected]>

* Deprecate prometheus-operator chart before helm repo index, so that it won't be listed in the hubs

Signed-off-by: Scott Rigby <[email protected]>

* Update prometheus-community/prometheus chart. Needed to update references to stable repo, but took the opportunity to reorganize, fix and simplify README

Signed-off-by: Scott Rigby <[email protected]>

* Add Helm 3 commands before Helm 2. Add helm update command. Reorganize the 'Upgrading Chart' section

Signed-off-by: Scott Rigby <[email protected]>

* Fix header

Signed-off-by: Scott Rigby <[email protected]>

* Fix markdown linting

Signed-off-by: Scott Rigby <[email protected]>

* Add direct links to values.yaml configuration file for easy browsing by end users without the CLI

Signed-off-by: Scott Rigby <[email protected]>

* Remove prometheus chart OWNERS file

Signed-off-by: Scott Rigby <[email protected]>

* Update prometheus-adapter chart README and bump version

Signed-off-by: Scott Rigby <[email protected]>

* prometheus chart: Return updated, working command example for Sharing Alerts Between Services

Signed-off-by: Scott Rigby <[email protected]>

* prometheus-adapter: fix configure command typos

Signed-off-by: Scott Rigby <[email protected]>

* prometheus-blackbox-exporter: Update readme, delete OWNERS file and bump chart version

Signed-off-by: Scott Rigby <[email protected]>

* prometheus-cloudwatch-exporter: Update Readme with new template, delete OWNERS file, bump chart version, update CHANGELOG

Signed-off-by: Scott Rigby <[email protected]>

* prometheus-consul-exporter: Update Readme per new template and bump chart

Signed-off-by: Scott Rigby <[email protected]>

* prometheus-couchdb-exporter: Update Readme per new template and bump chart version

Signed-off-by: Scott Rigby <[email protected]>

* prometheus-mongodb-exporter: Update Readme per new template, remove OWNERS file, bump chart version

Signed-off-by: Scott Rigby <[email protected]>

* prometheus-couchdb-exporter: Fix k8s 1.16 deprecated PodSecurityPolicy in the extensions/v1beta1 API version

Signed-off-by: Scott Rigby <[email protected]>

* prometheus-couchdb-exporter: Fix bad YAML indentation. How did this ever work?

Signed-off-by: Scott Rigby <[email protected]>

* prometheus-mysql-exporter: update readme per new template, remove OWNERS file, bump chart version

Signed-off-by: Scott Rigby <[email protected]>

* prometheus-nats-exporter: update readme per new template, move specific config note to values.yaml, remove OWNERS file, bump chart version

Signed-off-by: Scott Rigby <[email protected]>

* prometheus-node-exporter: update readme per new template, remove OWNERS file, bump chart version

Signed-off-by: Scott Rigby <[email protected]>

* prometheus-postgres-exporter: update readme per new template, remove OWNERS file, bump chart version

Signed-off-by: Scott Rigby <[email protected]>

* prometheus-pushgateway: update readme per new template, remove OWNERS file, bump chart version

Signed-off-by: Scott Rigby <[email protected]>

* prometheus-rabbitmq-exporter: update readme per new template, bump chart version

Signed-off-by: Scott Rigby <[email protected]>

* prometheus-redis-exporter: update readme per new template, remove OWNERS file, bump chart version

Signed-off-by: Scott Rigby <[email protected]>

* prometheus-snmp-exporter: update readme per new template, remove OWNERS file, bump chart version

Signed-off-by: Scott Rigby <[email protected]>

* prometheus-to-sd: update readme per new template, remove OWNERS file, bump chart version

Signed-off-by: Scott Rigby <[email protected]>

* prometheus-to-sd: fix deprecated deployment apps/v1beta1

Signed-off-by: Scott Rigby <[email protected]>

* Remove instructions for stable repos from all charts, except prometheus and deprecated prometheus-operator, as only those have dependencies on stable charts

Signed-off-by: Scott Rigby <[email protected]>

* Temporary workaround github API rate limiting

Signed-off-by: Scott Rigby <[email protected]>

* prometheus-to-sd: missing required field "selector" in io.k8s.api.apps.v1.DeploymentSpec

Signed-off-by: Scott Rigby <[email protected]>

* disable chart testing for prometheus-to-sd. If not running on GCE, will error: "Failed to get GCE config"

Signed-off-by: Scott Rigby <[email protected]>

Co-authored-by: André Bauer <[email protected]>
  • Loading branch information
scottrigby and monotek committed Sep 9, 2020
1 parent 52eae40 commit a94381a
Show file tree
Hide file tree
Showing 52 changed files with 821 additions and 1,420 deletions.
13 changes: 5 additions & 8 deletions charts/kube-prometheus/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,18 +1,15 @@
apiVersion: v1
description: Provides easy monitoring definitions for Kubernetes services, and deployment and management of Prometheus instances.
deprecated: true
description: DEPRECATED - This chart will be renamed. See https://github.com/prometheus-community/community/issues/28#issuecomment-670406329
icon: https://raw.githubusercontent.com/prometheus/prometheus.github.io/master/assets/prometheus_logo-cb55bb5c346.png
engine: gotpl
maintainers:
- name: vsliouniaev
- name: bismarck
- name: gianrubio
email: [email protected]
name: kube-prometheus
maintainers: []
name: prometheus-operator
sources:
- https://github.com/coreos/kube-prometheus
- https://github.com/coreos/prometheus-operator
- https://coreos.com/operators/prometheus
version: 9.3.1
version: 9.3.2
appVersion: 0.38.1
tillerVersion: ">=2.12.0"
home: https://github.com/coreos/kube-prometheus
Expand Down
2 changes: 1 addition & 1 deletion charts/prometheus-adapter/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
apiVersion: v1
name: prometheus-adapter
version: 2.5.0
version: 2.5.1
appVersion: v0.7.0
description: A Helm chart for k8s prometheus adapter
home: https://github.com/DirectXMan12/k8s-prometheus-adapter
Expand Down
8 changes: 0 additions & 8 deletions charts/prometheus-adapter/OWNERS

This file was deleted.

133 changes: 60 additions & 73 deletions charts/prometheus-adapter/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,22 +6,74 @@ Installs the [Prometheus Adapter](https://github.com/DirectXMan12/k8s-prometheus

Kubernetes 1.14+

## Installing the Chart
## Get Repo Info

To install the chart with the release name `my-release`:
```console
helm repo add prometheus-community https://prometheus-community.github.io/helm-charts
helm repo update
```

_See [helm repo](https://helm.sh/docs/helm/helm_repo/) for command documentation._

## Install Chart

```console
# Helm 3
$ helm install [RELEASE_NAME] prometheus-community/prometheus-adapter

# Helm 2
$ helm install --name [RELEASE_NAME] prometheus-community/prometheus-adapter
```

_See [configuration](#configuration) below._

_See [helm install](https://helm.sh/docs/helm/helm_install/) for command documentation._

## Uninstall Chart

```console
$ helm install --name my-release stable/prometheus-adapter
# Helm 3
$ helm uninstall [RELEASE_NAME]

# Helm 2
# helm delete --purge [RELEASE_NAME]
```

This command deploys the prometheus adapter with the default configuration. The [configuration](#configuration) section lists the parameters that can be configured during installation.
This removes all the Kubernetes components associated with the chart and deletes the release.

_See [helm uninstall](https://helm.sh/docs/helm/helm_uninstall/) for command documentation._

## Upgrading Chart

```console
# Helm 3 or 2
$ helm upgrade [RELEASE_NAME] [CHART] --install
```

_See [helm upgrade](https://helm.sh/docs/helm/helm_upgrade/) for command documentation._

## Configuration

See [Customizing the Chart Before Installing](https://helm.sh/docs/intro/using_helm/#customizing-the-chart-before-installing). To see all configurable options with detailed comments, visit the chart's [values.yaml](./values.yaml), or run these configuration commands:

```console
# Helm 2
$ helm inspect values prometheus-community/prometheus-adapter

# Helm 3
$ helm show values prometheus-community/prometheus-adapter
```

## Using the Chart
### Prometheus Service Endpoint

To use the chart, ensure the `prometheus.url` and `prometheus.port` are configured with the correct Prometheus service endpoint. If Prometheus is exposed under HTTPS the host's CA Bundle must be exposed to the container using `extraVolumes` and `extraVolumeMounts`.

### Adapter Rules

Additionally, the chart comes with a set of default rules out of the box but they may pull in too many metrics or not map them correctly for your needs. Therefore, it is recommended to populate `rules.custom` with a list of rules (see the [config document](https://github.com/DirectXMan12/k8s-prometheus-adapter/blob/master/docs/config.md) for the proper format).

### Horizontal Pod Autoscaler Metrics

Finally, to configure your Horizontal Pod Autoscaler to use the custom metric, see the custom metrics section of the [HPA walkthrough](https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale-walkthrough/#autoscaling-on-multiple-metrics-and-custom-metrics).

The Prometheus Adapter can serve three different [metrics APIs](https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/#support-for-metrics-apis):
Expand All @@ -30,7 +82,7 @@ The Prometheus Adapter can serve three different [metrics APIs](https://kubernet

Enabling this option will cause custom metrics to be served at `/apis/custom.metrics.k8s.io/v1beta1`. Enabled by default when `rules.default` is true, but can be customized by populating `rules.custom`:

```
```yaml
rules:
custom:
- seriesQuery: '{__name__=~"^some_metric_count$"}'
Expand All @@ -46,7 +98,7 @@ rules:
Enabling this option will cause external metrics to be served at `/apis/external.metrics.k8s.io/v1beta1`. Can be enabled by populating `rules.external`:

```
```yaml
rules:
external:
- seriesQuery: '{__name__=~"^some_metric_count$"}'
Expand All @@ -62,7 +114,7 @@ rules:

Enabling this option will cause resource metrics to be served at `/apis/metrics.k8s.io/v1beta1`. Resource metrics will allow pod CPU and Memory metrics to be used in [Horizontal Pod Autoscalers](https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/) as well as the `kubectl top` command. Can be enabled by populating `rules.resource`:

```
```yaml
rules:
resource:
cpu:
Expand Down Expand Up @@ -93,68 +145,3 @@ rules:
```

**NOTE:** Setting a value for `rules.resource` will also deploy the resource metrics API service, providing the same functionality as [metrics-server](https://github.com/helm/charts/tree/master/stable/metrics-server). As such it is not possible to deploy them both in the same cluster.

## Uninstalling the Chart

To uninstall/delete the `my-release` deployment:

```console
$ helm delete my-release
```

The command removes all the Kubernetes components associated with the chart and deletes the release.

## Configuration

The following table lists the configurable parameters of the Prometheus Adapter chart and their default values.

| Parameter | Description | Default |
| ------------------------------- | ------------------------------------------------------------------------------- | --------------------------------------------|
| `affinity` | Node affinity | `{}` |
| `image.repository` | Image repository | `directxman12/k8s-prometheus-adapter-amd64` |
| `image.tag` | Image tag | `v0.7.0` |
| `image.pullPolicy` | Image pull policy | `IfNotPresent` |
| `image.pullSecrets` | Image pull secrets | `{}` |
| `logLevel` | Log level | `4` |
| `listenPort` | Port that application would listen on in the container | `6443` |
| `metricsRelistInterval` | Interval at which to re-list the set of all available metrics from Prometheus | `1m` |
| `nodeSelector` | Node labels for pod assignment | `{}` |
| `podLabels` | Labels to add to the pod | `{}` |
| `podAnnotations` | Annotations to add to the pod | `{}` |
| `priorityClassName` | Pod priority | `` |
| `prometheus.url` | Url of where we can find the Prometheus service | `http://prometheus.default.svc` |
| `prometheus.port` | Port of where we can find the Prometheus service, zero to omit this option | `9090` |
| `prometheus.path` | Custom path to append to the prometheus URL | `` |
| `rbac.create` | If true, create & use RBAC resources | `true` |
| `resources` | CPU/Memory resource requests/limits | `{}` |
| `rules.default` | If `true`, enable a set of default rules in the configmap | `true` |
| `rules.custom` | A list of custom configmap rules | `[]` |
| `rules.existing` | The name of an existing configMap with rules. Overrides default, custom and external. | `` |
| `rules.external` | A list of custom rules for external metrics API | `[]` |
| `rules.resource` | `resourceRules` to set in configmap rules | `{}` |
| `service.annotations` | Annotations to add to the service | `{}` |
| `service.port` | Service port to expose | `443` |
| `service.type` | Type of service to create | `ClusterIP` |
| `serviceAccount.create` | If true, create & use Serviceaccount | `true` |
| `serviceAccount.name` | If not set and create is true, a name is generated using the fullname template | `` |
| `tls.enable` | If true, use the provided certificates. If false, generate self-signed certs | `false` |
| `tls.ca` | Public CA file that signed the APIService (ignored if tls.enable=false) | `` |
| `tls.key` | Private key of the APIService (ignored if tls.enable=false) | `` |
| `tls.certificate` | Public key of the APIService (ignored if tls.enable=false) | `` |
| `extraVolumeMounts` | Any extra volumes mounts | `[]` |
| `extraVolumes` | Any extra volumes | `[]` |
| `tolerations` | List of node taints to tolerate | `[]` |

Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. For example,

```console
$ helm install --name my-release \
--set logLevel=1 \
stable/prometheus-adapter
```

Alternatively, a YAML file that specifies the values for the above parameters can be provided while installing the chart. For example,

```console
$ helm install --name my-release -f values.yaml stable/prometheus-adapter
```
2 changes: 1 addition & 1 deletion charts/prometheus-blackbox-exporter/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: v1
description: Prometheus Blackbox Exporter
name: prometheus-blackbox-exporter
version: 4.3.0
version: 4.3.1
appVersion: 0.16.0
home: https://github.com/prometheus/blackbox_exporter
sources:
Expand Down
6 changes: 0 additions & 6 deletions charts/prometheus-blackbox-exporter/OWNERS

This file was deleted.

Loading

0 comments on commit a94381a

Please sign in to comment.