Skip to content

Commit

Permalink
updated version
Browse files Browse the repository at this point in the history
  • Loading branch information
Harsh Arora authored and Harsh Arora committed Oct 6, 2021
1 parent a37e24c commit 4e763df
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 8 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,3 +37,7 @@ All notable changes to this project will be documented in this file.
### Added
- Added fix for lightweight-CPX not working with CME.
- Updated pip requirements.

## [1.4.9] - 2021-10-05
### Added
- Added fix to handle ERROR message for lbvs added by CIC.
14 changes: 7 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -100,15 +100,15 @@ For this:
<summary>Usage as a Container</summary>
<br>

In order to use the exporter as a container, the image ```quay.io/citrix/citrix-adc-metrics-exporter:1.4.8``` will need to be pulled using;
In order to use the exporter as a container, the image ```quay.io/citrix/citrix-adc-metrics-exporter:1.4.9``` will need to be pulled using;
```
docker pull quay.io/citrix/citrix-adc-metrics-exporter:1.4.8
docker pull quay.io/citrix/citrix-adc-metrics-exporter:1.4.9
```
**NOTE:** It can also be build locally using ```docker build -f Dockerfile -t <image_name>:<tag> ./```

Now, exporter can be run using:
```
docker run -dt -p <host_port>:<container_port> --mount type=bind,source=<host-path-for-config-file>,target=/exporter/config.yaml quay.io/citrix/citrix-adc-metrics-exporter:1.4.8 [flags] --config-file=/exporter/config.yaml
docker run -dt -p <host_port>:<container_port> --mount type=bind,source=<host-path-for-config-file>,target=/exporter/config.yaml quay.io/citrix/citrix-adc-metrics-exporter:1.4.9 [flags] --config-file=/exporter/config.yaml
```
where the flags are:

Expand All @@ -131,7 +131,7 @@ flag&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbs

To setup the exporter as given in the diagram, the following command can be used:
```
docker run -dt -p 8888:8888 --mount type=bind,source=/path/to/config.yaml,target=/exporter/config.yaml --name citrix-adc-exporter quay.io/citrix/citrix-adc-metrics-exporter:1.4.8 --target-nsip=10.0.0.1 --port=8888 --config-file=/exporter/config.yaml
docker run -dt -p 8888:8888 --mount type=bind,source=/path/to/config.yaml,target=/exporter/config.yaml --name citrix-adc-exporter quay.io/citrix/citrix-adc-metrics-exporter:1.4.9 --target-nsip=10.0.0.1 --port=8888 --config-file=/exporter/config.yaml
```
This directs the exporter container to scrape the 10.0.0.1 IP, and the expose the stats it collects on port 8888.

Expand Down Expand Up @@ -160,7 +160,7 @@ For this:
Certificate should then be mounted at the '--cacert-path' provided. For instance, if cert is 'cacert.pem' and '--cacert-path' provided in 'config.yaml' is '/exporter/cacert.pem'

```
docker run -dt -p 8888:8888 --mount type=bind,source=/path/to/config.yaml,target=/exporter/config.yaml --mount type=bind,source=/path/to/cacert.pem,target=/exporter/cacert.pem --name citrix-adc-exporter quay.io/citrix/citrix-adc-metrics-exporter:1.4.8 --target-nsip=10.0.0.1 --port=8888 --config-file=/exporter/config.yaml
docker run -dt -p 8888:8888 --mount type=bind,source=/path/to/config.yaml,target=/exporter/config.yaml --mount type=bind,source=/path/to/cacert.pem,target=/exporter/cacert.pem --name citrix-adc-exporter quay.io/citrix/citrix-adc-metrics-exporter:1.4.9 --target-nsip=10.0.0.1 --port=8888 --config-file=/exporter/config.yaml
```
**NOTE:** If default port to connect with ADC is not 80/443 for HTTP/HTTPS respectively, then append --target-nsip with port. For instance, if port for ADC is 9080 then use: --target-nsip=10.0.0.1:9080

Expand Down Expand Up @@ -191,7 +191,7 @@ metadata:
spec:
containers:
- name: exporter
image: quay.io/citrix/citrix-adc-metrics-exporter:1.4.8
image: quay.io/citrix/citrix-adc-metrics-exporter:1.4.9
args:
- "--target-nsip=10.0.0.1"
- "--port=8888"
Expand Down Expand Up @@ -270,7 +270,7 @@ metadata:
spec:
containers:
- name: exporter
image: quay.io/citrix/citrix-adc-metrics-exporter:1.4.8
image: quay.io/citrix/citrix-adc-metrics-exporter:1.4.9
args:
- "--target-nsip=10.0.0.1"
- "--port=8888"
Expand Down
2 changes: 2 additions & 0 deletions exporter.py
Original file line number Diff line number Diff line change
Expand Up @@ -584,6 +584,8 @@ def update_lbvs_label(self, label_values, lbvs_dict, log_prefix_match):
0].split("-", 1)[0])
# update lables only if prefix provided is same as CIC prefix used
if cur_prefix == self.k8s_cic_prefix:
if label_values[0] not in lbvs_dict:
return False
comments = lbvs_dict[label_values[0]]
comments = comments.split(',')
if comments[0].split(':')[0] == 'lbsvc':
Expand Down
2 changes: 1 addition & 1 deletion version/VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.4.8
1.4.9

0 comments on commit 4e763df

Please sign in to comment.