Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

UI: Fix JavaScript error in MSIE due to endswith() usage #1172

Merged
merged 3 commits into from
Jan 2, 2018

Conversation

hoffie
Copy link
Contributor

@hoffie hoffie commented Dec 29, 2017

MSIE does not support endswith() [1]. substr() can be used to work around this limitation.

@stuartnelson3: Could this be merged?

[1] https://docs.microsoft.com/en-us/scripting/javascript/reference/endswith-method-string-javascript

@w0rm w0rm merged commit 0e63715 into prometheus:master Jan 2, 2018
@w0rm
Copy link
Member

w0rm commented Jan 2, 2018

@hoffie thanks for your contribution!

@hoffie hoffie deleted the index-ie-compat branch January 7, 2018 20:00
hh pushed a commit to ii/alertmanager that referenced this pull request Nov 30, 2018
* Add fallback for missing /proc/1/mounts

On some systems, `/proc/1/mounts` is hidden from non-root users due to
the `hidepid` procfs feature. Attempt to fallback to `/proc/mounts` if
`/proc/1/mounts` is not found.

Signed-off-by: Ben Kochie <[email protected]>

* Add tests.

Signed-off-by: Ben Kochie <[email protected]>

* Add CHANGELOG entry.

Signed-off-by: Ben Kochie <[email protected]>
hh pushed a commit to ii/alertmanager that referenced this pull request Nov 30, 2018
* collector/diskstats: don't fail if there are extra stats, just ignore… (prometheus#1125)

* collector/diskstats: don't fail if there are extra stats, just ignore them

Signed-off-by: Paul Gier <[email protected]>
Signed-off-by: Ben Kochie <[email protected]>

* collector/hwmon_linux: handle temperature sensor file which doesn't have item suffix (prometheus#1123)

In some cases the file might be called "temp" instead of the usual format "temp<index>_<item>"
as described in the kernel docs: https://www.kernel.org/doc/Documentation/hwmon/sysfs-interface
In this case, treat this as an _input file containing the current temperature reading.

Fixes prometheus#1122

Signed-off-by: Paul Gier <[email protected]>
Signed-off-by: Ben Kochie <[email protected]>

* Handle 'Unknown' as measurement value. (prometheus#1113)

We use the output-compatible perccli and storcli.py does not handle 'Unknown' as a result:
```
sg="Error parsing \"/var/lib/node_exporter/perccli.prom\": text format parsing error in line 222: expected float as value, got \"Unknown\"" source="textfile.go:212"
```
I know, the perccli should not return 'Unknown' but this error breaks all other useful measurements because the prom file is not parsable. My if condition fixes this.

Signed-off-by: Andreas Wirooks <[email protected]>
Signed-off-by: Ben Kochie <[email protected]>

* circleci: switch to 2.1 config

Signed-off-by: Ben Kochie <[email protected]>

* Convert to Go modules (prometheus#1178)

* Convert to Go modules

* Update promu config.
* Convert to Go modules.
* Update vendoring.
* Update Makefile.common.
* Update circleci config.
* Use Prometheus release tar for promtool.
* Fixup unpack

* Use temp dir for unpacking tools.
* Use BSD compatible tar command.
* OpenBSD mkdir doesn't support `-v`.

Signed-off-by: Ben Kochie <[email protected]>

* Add fallback for missing /proc/1/mounts (prometheus#1172)

* Add fallback for missing /proc/1/mounts

On some systems, `/proc/1/mounts` is hidden from non-root users due to
the `hidepid` procfs feature. Attempt to fallback to `/proc/mounts` if
`/proc/1/mounts` is not found.

Signed-off-by: Ben Kochie <[email protected]>

* Add tests.

Signed-off-by: Ben Kochie <[email protected]>

* Add CHANGELOG entry.

Signed-off-by: Ben Kochie <[email protected]>

* Release v0.17.0 (prometheus#1168)

* Update CHANGELOG
* Update VERSION

Signed-off-by: Ben Kochie <[email protected]>
hh pushed a commit to ii/alertmanager that referenced this pull request Dec 3, 2018
* Add fallback for missing /proc/1/mounts

On some systems, `/proc/1/mounts` is hidden from non-root users due to
the `hidepid` procfs feature. Attempt to fallback to `/proc/mounts` if
`/proc/1/mounts` is not found.

Signed-off-by: Ben Kochie <[email protected]>

* Add tests.

Signed-off-by: Ben Kochie <[email protected]>

* Add CHANGELOG entry.

Signed-off-by: Ben Kochie <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants