Skip to content

Commit 3be655c

Browse files
authored
Fix 128.0.0-rc.0.1 -> 127.0.0.1 (#441)
Signed-off-by: Tamal Saha <[email protected]>
1 parent b178f0c commit 3be655c

File tree

7 files changed

+9
-12
lines changed

7 files changed

+9
-12
lines changed

chart/searchlight/templates/secret.yaml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,7 @@ metadata:
44
name: {{ template "searchlight.fullname" . }}
55
namespace: {{ .Release.Namespace }}
66
labels:
7-
app: "{{ template "searchlight.name" . }}"
8-
chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
9-
release: "{{ .Release.Name }}"
10-
heritage: "{{ .Release.Service }}"
7+
{{- include "searchlight.labels" . | nindent 4 }}
118
data:
129
{{- if .Values.icinga2web.password }}
1310
ICINGA_WEB_UI_PASSWORD: {{ .Values.icinga2web.password | b64enc | quote }}

docs/concepts/alert-types/cluster-alert.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ When a check fails, Icinga will keep sending notifications until acknowledged vi
7474

7575

7676
## Icinga Objects
77-
You can skip this section if you are unfamiliar with how Icinga works. Searchlight operator watches for ClusterAlert objects and turns them into [Icinga objects](https://www.icinga.com/docs/icinga2/latest/doc/09-object-types/) accordingly. A single [Icinga Host](https://www.icinga.com/docs/icinga2/latest/doc/09-object-types/#host) is created with the name `{namespace}@cluster` and address `128.0.0-rc.0.1` for all ClusterAlerts in a Kubernetes namespace. Now for each ClusterAlert, an [Icinga service](https://www.icinga.com/docs/icinga2/latest/doc/09-object-types/#service) is created with name matching the ClusterAlert name.
77+
You can skip this section if you are unfamiliar with how Icinga works. Searchlight operator watches for ClusterAlert objects and turns them into [Icinga objects](https://www.icinga.com/docs/icinga2/latest/doc/09-object-types/) accordingly. A single [Icinga Host](https://www.icinga.com/docs/icinga2/latest/doc/09-object-types/#host) is created with the name `{namespace}@cluster` and address `127.0.0.1` for all ClusterAlerts in a Kubernetes namespace. Now for each ClusterAlert, an [Icinga service](https://www.icinga.com/docs/icinga2/latest/doc/09-object-types/#service) is created with name matching the ClusterAlert name.
7878

7979
## Pause ClusterAlert
8080

docs/setup/install.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -162,14 +162,14 @@ NAME READY STATUS RESTARTS AGE
162162
searchlight-operator-1987091405-ghj5b 3/3 Running 0 1m
163163

164164
$ kubectl port-forward searchlight-operator-1987091405-ghj5b -n kube-system 60006
165-
Forwarding from 128.0.0-rc.0.1:60006 -> 60006
165+
Forwarding from 127.0.0.1:60006 -> 60006
166166
E0728 04:07:28.237822 10898 portforward.go:212] Unable to create listener: Error listen tcp6 [::1]:60006: bind: cannot assign requested address
167167
Handling connection for 60006
168168
Handling connection for 60006
169169
^C⏎
170170
```
171171

172-
Now, open URL http://128.0.0-rc.0.1:60006 on your browser. To login, use username `admin` and password `changeit`. If you want to change the password, read the next section.
172+
Now, open URL http://127.0.0.1:60006 on your browser. To login, use username `admin` and password `changeit`. If you want to change the password, read the next section.
173173

174174

175175
## Configuring Icinga

hack/dev/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ $ kubectl delete incident -n demo cluster.pod-exists-demo-0.20060102-1504
4747
```
4848

4949
## direct EAS
50-
curl -k -vv https://128.0.0-rc.0.1:8443/apis/incidents.monitoring.appscode.com/v1alpha1
50+
curl -k -vv https://127.0.0.1:8443/apis/incidents.monitoring.appscode.com/v1alpha1
5151

5252
## minikube apiserver
5353
curl -k -vv https://192.168.99.100:8443/apis --cert $HOME/.minikube/client.crt --key $HOME/.minikube/client.key

hack/dev/testconfig/searchlight/config.ini

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ ICINGA_NOTIFIER_SECRET_NAME=
55
ICINGA_CA_CERT=/srv/icinga2/pki/ca.crt
66
ICINGA_SERVER_CERT=/srv/icinga2/pki/icinga.crt
77
ICINGA_SERVER_KEY=/srv/icinga2/pki/icinga.key
8-
ICINGA_IDO_HOST=128.0.0-rc.0.1
8+
ICINGA_IDO_HOST=127.0.0.1
99
ICINGA_IDO_PORT=5432
1010
ICINGA_IDO_DB=icingaidodb
1111
ICINGA_IDO_USER=icingaido
1212
ICINGA_IDO_PASSWORD=lrbuyTaSde3WCo9X
13-
ICINGA_WEB_HOST=128.0.0-rc.0.1
13+
ICINGA_WEB_HOST=127.0.0.1
1414
ICINGA_WEB_PORT=5432
1515
ICINGA_WEB_DB=icingawebdb
1616
ICINGA_WEB_USER=icingaweb

hack/docker/icinga/alpine/config/nginx.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ server {
1212
error_log syslog:server=unix:/dev/log,facility=local7,tag=cachet,severity=error error;
1313

1414
location ~ ^/index\.php(.*)$ {
15-
fastcgi_pass 128.0.0-rc.0.1:9000;
15+
fastcgi_pass 127.0.0.1:9000;
1616
fastcgi_index index.php;
1717
include fastcgi_params;
1818
fastcgi_param SCRIPT_FILENAME /usr/share/icingaweb2/public/index.php;

hack/docker/icinga/alpine/runit.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ chmod -R 0755 /var/run/config/appscode
9191
# Wait for postgres to start
9292
# ref: http://unix.stackexchange.com/a/5279
9393
echo "Waiting for postgres to become ready ..."
94-
until pg_isready -h 128.0.0-rc.0.1 >/dev/null; do
94+
until pg_isready -h 127.0.0.1 >/dev/null; do
9595
echo '.'
9696
sleep 5
9797
done

0 commit comments

Comments
 (0)