This repository was archived by the owner on Oct 27, 2022. It is now read-only.
Added monitoring function for link022 #81
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Contributor
zhangtianyang
commented
Aug 15, 2018
zhangtianyang
commented
- Added a goroutine to periodically collect AP & system states.
- Added a Prometheus exporter for link022 to export states.
one update. 2. Fix a bug in using context.
2. support array type metric value
fixed a bug caused by misusing append function. fixed a bug in generating metric name.
fixed a bug in reading cpu usage file
by forgeting reset prometheus collector after every test.
Codecov Report
@@ Coverage Diff @@
## master #81 +/- ##
==========================================
- Coverage 63% 59.48% -3.53%
==========================================
Files 11 14 +3
Lines 638 1049 +411
==========================================
+ Hits 402 624 +222
- Misses 167 329 +162
- Partials 69 96 +27
Continue to review full report at Codecov.
|
boleifu
reviewed
Aug 16, 2018
agent/monitoring/monitoring.go
Outdated
| const ( | ||
| statesUpdateDelay = 15 * time.Second | ||
| systemClockTick = 100 | ||
| physicalMemoryPath = "/access-points/access-point[hostname=link022-pi-ap]/system/memory/state/physical" |
There was a problem hiding this comment.
We should not hard code host name here. It is not always link022-pi-ap. Same for the rest of paths.
agent/monitoring/monitoring.go
Outdated
| p := strings.Replace(selfMemPath, "$pid", spid, 1) | ||
| pbPath, err = xpath.ToGNMIPath(p) | ||
| if err != nil { | ||
| log.Errorf("convert %v to GNMI path failed: %v", p, err) |
There was a problem hiding this comment.
No need to log this, since it is already logged in caller function.
agent/monitoring/monitoring.go
Outdated
| } | ||
| selfMemory, err := strconv.ParseInt(match[1], 10, 64) | ||
| if err != nil { | ||
| log.Errorf("failed convert string to int: %v", err) |
| } | ||
| stateOpt = gnmi.GNXIStateOptGenerator(pbPath, uint64(selfMemory*1024), gnmi.InternalUpdateState) | ||
| if err = s.InternalUpdate(stateOpt); err != nil { | ||
| log.Errorf("update state failed: %v", err) |
| log.Errorf("failed open %v: %v", filePath, err) | ||
| return err | ||
| } | ||
| cpuStr0 := strings.Split(string(b0), " ") |
There was a problem hiding this comment.
It might be better to use regex instead of doing spiting and using hard-coded index.
There was a problem hiding this comment.
This file simply contains 52 numbers. Their positions are fixed. So it's better to find them by index.
agent/monitoring/monitoring.go
Outdated
| p := strings.Replace(channelPath, "$id", phyIDStr, 1) | ||
| pbPath, err := xpath.ToGNMIPath(p) | ||
| if err != nil { | ||
| log.Errorf("convert %v to GNMI path failed: %v", p, err) |
There was a problem hiding this comment.
No need to log error before return. Same for others.
zhiweicen
reviewed
Aug 16, 2018
|
|
||
| ### Prerequisites | ||
|
|
||
| Dolnload entire Link022 repository. |
| @@ -0,0 +1,83 @@ | |||
| # OpenConfig Telemetry Exporter (Prometheus) | |||
|
|
|||
| This directory contains a exporter that periodically collects AP's info via gNMI and exposes converted metrics to a web page. Prometheus can monitor AP's status by scrape that web page. | |||
| @@ -0,0 +1,83 @@ | |||
| # OpenConfig Telemetry Exporter (Prometheus) | |||
|
|
|||
| This directory contains a exporter that periodically collects AP's info via gNMI and exposes converted metrics to a web page. Prometheus can monitor AP's status by scrape that web page. | |||
|
|
||
| var ( | ||
| targetAddr = flag.String("target_addr", "localhost:10161", "The target address in the format of host:port") | ||
| targetName = flag.String("target_name", "hostname.com", "The target name use to verify the hostname returned by TLS handshake") |
Corrected some typos.
boleifu
approved these changes
Aug 17, 2018
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.