diff options
author | Paul Gier <pgier@redhat.com> | 2019-08-27 02:26:19 -0500 |
---|---|---|
committer | Ben Kochie <superq@gmail.com> | 2019-08-27 09:26:19 +0200 |
commit | 0b7ac85acb7d3497c57d6971a31a06ffe45547ba (patch) | |
tree | 3451db1fd77d68551acdd0a65d8e96213140f267 | |
parent | 154d59dee72b894f7245d8d78c9344d1211d521f (diff) | |
download | prometheus_node_collector-0b7ac85acb7d3497c57d6971a31a06ffe45547ba.tar.bz2 prometheus_node_collector-0b7ac85acb7d3497c57d6971a31a06ffe45547ba.tar.xz prometheus_node_collector-0b7ac85acb7d3497c57d6971a31a06ffe45547ba.zip |
update procfs to v0.0.4 (#1457)
Signed-off-by: Paul Gier <pgier@redhat.com>
-rw-r--r-- | go.mod | 2 | ||||
-rw-r--r-- | go.sum | 4 | ||||
-rw-r--r-- | vendor/github.com/prometheus/procfs/fixtures.ttar | 1022 | ||||
-rw-r--r-- | vendor/github.com/prometheus/procfs/sysfs/net_class.go | 163 | ||||
-rw-r--r-- | vendor/github.com/prometheus/procfs/vm.go | 174 | ||||
-rw-r--r-- | vendor/github.com/prometheus/procfs/xfs/parse.go | 200 | ||||
-rw-r--r-- | vendor/github.com/prometheus/procfs/xfs/xfs.go | 121 | ||||
-rw-r--r-- | vendor/modules.txt | 2 |
8 files changed, 1514 insertions, 174 deletions
@@ -15,7 +15,7 @@ require ( | |||
15 | github.com/prometheus/client_golang v1.0.0 | 15 | github.com/prometheus/client_golang v1.0.0 |
16 | github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90 | 16 | github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90 |
17 | github.com/prometheus/common v0.4.1 | 17 | github.com/prometheus/common v0.4.1 |
18 | github.com/prometheus/procfs v0.0.4-0.20190731153504-5da962fa40f1 | 18 | github.com/prometheus/procfs v0.0.4 |
19 | github.com/siebenmann/go-kstat v0.0.0-20160321171754-d34789b79745 | 19 | github.com/siebenmann/go-kstat v0.0.0-20160321171754-d34789b79745 |
20 | github.com/sirupsen/logrus v1.4.2 // indirect | 20 | github.com/sirupsen/logrus v1.4.2 // indirect |
21 | github.com/soundcloud/go-runit v0.0.0-20150630195641-06ad41a06c4a | 21 | github.com/soundcloud/go-runit v0.0.0-20150630195641-06ad41a06c4a |
@@ -68,8 +68,8 @@ github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y8 | |||
68 | github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= | 68 | github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= |
69 | github.com/prometheus/procfs v0.0.2 h1:6LJUbpNm42llc4HRCuvApCSWB/WfhuNo9K98Q9sNGfs= | 69 | github.com/prometheus/procfs v0.0.2 h1:6LJUbpNm42llc4HRCuvApCSWB/WfhuNo9K98Q9sNGfs= |
70 | github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= | 70 | github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= |
71 | github.com/prometheus/procfs v0.0.4-0.20190731153504-5da962fa40f1 h1:uqK/YnaVFq1uofHlzj+IR4HhCYA/nbrvJ431l7cm7Vs= | 71 | github.com/prometheus/procfs v0.0.4 h1:w8DjqFMJDjuVwdZBQoOozr4MVWOnwF7RcL/7uxBjY78= |
72 | github.com/prometheus/procfs v0.0.4-0.20190731153504-5da962fa40f1/go.mod h1:4A/X28fw3Fc593LaREMrKMqOKvUAntwMDaekg4FpcdQ= | 72 | github.com/prometheus/procfs v0.0.4/go.mod h1:4A/X28fw3Fc593LaREMrKMqOKvUAntwMDaekg4FpcdQ= |
73 | github.com/siebenmann/go-kstat v0.0.0-20160321171754-d34789b79745 h1:IuH7WumZNax0D+rEqmy2TyhKCzrtMGqbZO0b8rO00JA= | 73 | github.com/siebenmann/go-kstat v0.0.0-20160321171754-d34789b79745 h1:IuH7WumZNax0D+rEqmy2TyhKCzrtMGqbZO0b8rO00JA= |
74 | github.com/siebenmann/go-kstat v0.0.0-20160321171754-d34789b79745/go.mod h1:G81aIFAMS9ECrwBYR9YxhlPjWgrItd+Kje78O6+uqm8= | 74 | github.com/siebenmann/go-kstat v0.0.0-20160321171754-d34789b79745/go.mod h1:G81aIFAMS9ECrwBYR9YxhlPjWgrItd+Kje78O6+uqm8= |
75 | github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= | 75 | github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= |
diff --git a/vendor/github.com/prometheus/procfs/fixtures.ttar b/vendor/github.com/prometheus/procfs/fixtures.ttar index 75dd29d..8591c27 100644 --- a/vendor/github.com/prometheus/procfs/fixtures.ttar +++ b/vendor/github.com/prometheus/procfs/fixtures.ttar | |||
@@ -333,6 +333,981 @@ Node 0, zone DMA32 759 572 791 475 194 45 12 0 | |||
333 | Node 0, zone Normal 4381 1093 185 1530 567 102 4 0 0 0 0 | 333 | Node 0, zone Normal 4381 1093 185 1530 567 102 4 0 0 0 0 |
334 | Mode: 644 | 334 | Mode: 644 |
335 | # ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - | 335 | # ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - |
336 | Path: fixtures/proc/crypto | ||
337 | Lines: 971 | ||
338 | name : ccm(aes) | ||
339 | driver : ccm_base(ctr(aes-aesni),cbcmac(aes-aesni)) | ||
340 | module : ccm | ||
341 | priority : 300 | ||
342 | refcnt : 4 | ||
343 | selftest : passed | ||
344 | internal : no | ||
345 | type : aead | ||
346 | async : no | ||
347 | blocksize : 1 | ||
348 | ivsize : 16 | ||
349 | maxauthsize : 16 | ||
350 | geniv : <none> | ||
351 | |||
352 | name : cbcmac(aes) | ||
353 | driver : cbcmac(aes-aesni) | ||
354 | module : ccm | ||
355 | priority : 300 | ||
356 | refcnt : 7 | ||
357 | selftest : passed | ||
358 | internal : no | ||
359 | type : shash | ||
360 | blocksize : 1 | ||
361 | digestsize : 16 | ||
362 | |||
363 | name : ecdh | ||
364 | driver : ecdh-generic | ||
365 | module : ecdh_generic | ||
366 | priority : 100 | ||
367 | refcnt : 1 | ||
368 | selftest : passed | ||
369 | internal : no | ||
370 | type : kpp | ||
371 | |||
372 | name : ecb(arc4) | ||
373 | driver : ecb(arc4)-generic | ||
374 | module : arc4 | ||
375 | priority : 100 | ||
376 | refcnt : 1 | ||
377 | selftest : passed | ||
378 | internal : no | ||
379 | type : skcipher | ||
380 | async : no | ||
381 | blocksize : 1 | ||
382 | min keysize : 1 | ||
383 | max keysize : 256 | ||
384 | ivsize : 0 | ||
385 | chunksize : 1 | ||
386 | walksize : 1 | ||
387 | |||
388 | name : arc4 | ||
389 | driver : arc4-generic | ||
390 | module : arc4 | ||
391 | priority : 0 | ||
392 | refcnt : 3 | ||
393 | selftest : passed | ||
394 | internal : no | ||
395 | type : cipher | ||
396 | blocksize : 1 | ||
397 | min keysize : 1 | ||
398 | max keysize : 256 | ||
399 | |||
400 | name : crct10dif | ||
401 | driver : crct10dif-pclmul | ||
402 | module : crct10dif_pclmul | ||
403 | priority : 200 | ||
404 | refcnt : 2 | ||
405 | selftest : passed | ||
406 | internal : no | ||
407 | type : shash | ||
408 | blocksize : 1 | ||
409 | digestsize : 2 | ||
410 | |||
411 | name : crc32 | ||
412 | driver : crc32-pclmul | ||
413 | module : crc32_pclmul | ||
414 | priority : 200 | ||
415 | refcnt : 1 | ||
416 | selftest : passed | ||
417 | internal : no | ||
418 | type : shash | ||
419 | blocksize : 1 | ||
420 | digestsize : 4 | ||
421 | |||
422 | name : __ghash | ||
423 | driver : cryptd(__ghash-pclmulqdqni) | ||
424 | module : kernel | ||
425 | priority : 50 | ||
426 | refcnt : 1 | ||
427 | selftest : passed | ||
428 | internal : yes | ||
429 | type : ahash | ||
430 | async : yes | ||
431 | blocksize : 16 | ||
432 | digestsize : 16 | ||
433 | |||
434 | name : ghash | ||
435 | driver : ghash-clmulni | ||
436 | module : ghash_clmulni_intel | ||
437 | priority : 400 | ||
438 | refcnt : 1 | ||
439 | selftest : passed | ||
440 | internal : no | ||
441 | type : ahash | ||
442 | async : yes | ||
443 | blocksize : 16 | ||
444 | digestsize : 16 | ||
445 | |||
446 | name : __ghash | ||
447 | driver : __ghash-pclmulqdqni | ||
448 | module : ghash_clmulni_intel | ||
449 | priority : 0 | ||
450 | refcnt : 1 | ||
451 | selftest : passed | ||
452 | internal : yes | ||
453 | type : shash | ||
454 | blocksize : 16 | ||
455 | digestsize : 16 | ||
456 | |||
457 | name : crc32c | ||
458 | driver : crc32c-intel | ||
459 | module : crc32c_intel | ||
460 | priority : 200 | ||
461 | refcnt : 5 | ||
462 | selftest : passed | ||
463 | internal : no | ||
464 | type : shash | ||
465 | blocksize : 1 | ||
466 | digestsize : 4 | ||
467 | |||
468 | name : cbc(aes) | ||
469 | driver : cbc(aes-aesni) | ||
470 | module : kernel | ||
471 | priority : 300 | ||
472 | refcnt : 1 | ||
473 | selftest : passed | ||
474 | internal : no | ||
475 | type : skcipher | ||
476 | async : no | ||
477 | blocksize : 16 | ||
478 | min keysize : 16 | ||
479 | max keysize : 32 | ||
480 | ivsize : 16 | ||
481 | chunksize : 16 | ||
482 | walksize : 16 | ||
483 | |||
484 | name : ctr(aes) | ||
485 | driver : ctr(aes-aesni) | ||
486 | module : kernel | ||
487 | priority : 300 | ||
488 | refcnt : 5 | ||
489 | selftest : passed | ||
490 | internal : no | ||
491 | type : skcipher | ||
492 | async : no | ||
493 | blocksize : 1 | ||
494 | min keysize : 16 | ||
495 | max keysize : 32 | ||
496 | ivsize : 16 | ||
497 | chunksize : 16 | ||
498 | walksize : 16 | ||
499 | |||
500 | name : pkcs1pad(rsa,sha256) | ||
501 | driver : pkcs1pad(rsa-generic,sha256) | ||
502 | module : kernel | ||
503 | priority : 100 | ||
504 | refcnt : 1 | ||
505 | selftest : passed | ||
506 | internal : no | ||
507 | type : akcipher | ||
508 | |||
509 | name : __xts(aes) | ||
510 | driver : cryptd(__xts-aes-aesni) | ||
511 | module : kernel | ||
512 | priority : 451 | ||
513 | refcnt : 1 | ||
514 | selftest : passed | ||
515 | internal : yes | ||
516 | type : skcipher | ||
517 | async : yes | ||
518 | blocksize : 16 | ||
519 | min keysize : 32 | ||
520 | max keysize : 64 | ||
521 | ivsize : 16 | ||
522 | chunksize : 16 | ||
523 | walksize : 16 | ||
524 | |||
525 | name : xts(aes) | ||
526 | driver : xts-aes-aesni | ||
527 | module : kernel | ||
528 | priority : 401 | ||
529 | refcnt : 1 | ||
530 | selftest : passed | ||
531 | internal : no | ||
532 | type : skcipher | ||
533 | async : yes | ||
534 | blocksize : 16 | ||
535 | min keysize : 32 | ||
536 | max keysize : 64 | ||
537 | ivsize : 16 | ||
538 | chunksize : 16 | ||
539 | walksize : 16 | ||
540 | |||
541 | name : __ctr(aes) | ||
542 | driver : cryptd(__ctr-aes-aesni) | ||
543 | module : kernel | ||
544 | priority : 450 | ||
545 | refcnt : 1 | ||
546 | selftest : passed | ||
547 | internal : yes | ||
548 | type : skcipher | ||
549 | async : yes | ||
550 | blocksize : 1 | ||
551 | min keysize : 16 | ||
552 | max keysize : 32 | ||
553 | ivsize : 16 | ||
554 | chunksize : 16 | ||
555 | walksize : 16 | ||
556 | |||
557 | name : ctr(aes) | ||
558 | driver : ctr-aes-aesni | ||
559 | module : kernel | ||
560 | priority : 400 | ||
561 | refcnt : 1 | ||
562 | selftest : passed | ||
563 | internal : no | ||
564 | type : skcipher | ||
565 | async : yes | ||
566 | blocksize : 1 | ||
567 | min keysize : 16 | ||
568 | max keysize : 32 | ||
569 | ivsize : 16 | ||
570 | chunksize : 16 | ||
571 | walksize : 16 | ||
572 | |||
573 | name : __cbc(aes) | ||
574 | driver : cryptd(__cbc-aes-aesni) | ||
575 | module : kernel | ||
576 | priority : 450 | ||
577 | refcnt : 1 | ||
578 | selftest : passed | ||
579 | internal : yes | ||
580 | type : skcipher | ||
581 | async : yes | ||
582 | blocksize : 16 | ||
583 | min keysize : 16 | ||
584 | max keysize : 32 | ||
585 | ivsize : 16 | ||
586 | chunksize : 16 | ||
587 | walksize : 16 | ||
588 | |||
589 | name : cbc(aes) | ||
590 | driver : cbc-aes-aesni | ||
591 | module : kernel | ||
592 | priority : 400 | ||
593 | refcnt : 1 | ||
594 | selftest : passed | ||
595 | internal : no | ||
596 | type : skcipher | ||
597 | async : yes | ||
598 | blocksize : 16 | ||
599 | min keysize : 16 | ||
600 | max keysize : 32 | ||
601 | ivsize : 16 | ||
602 | chunksize : 16 | ||
603 | walksize : 16 | ||
604 | |||
605 | name : __ecb(aes) | ||
606 | driver : cryptd(__ecb-aes-aesni) | ||
607 | module : kernel | ||
608 | priority : 450 | ||
609 | refcnt : 1 | ||
610 | selftest : passed | ||
611 | internal : yes | ||
612 | type : skcipher | ||
613 | async : yes | ||
614 | blocksize : 16 | ||
615 | min keysize : 16 | ||
616 | max keysize : 32 | ||
617 | ivsize : 0 | ||
618 | chunksize : 16 | ||
619 | walksize : 16 | ||
620 | |||
621 | name : ecb(aes) | ||
622 | driver : ecb-aes-aesni | ||
623 | module : kernel | ||
624 | priority : 400 | ||
625 | refcnt : 1 | ||
626 | selftest : passed | ||
627 | internal : no | ||
628 | type : skcipher | ||
629 | async : yes | ||
630 | blocksize : 16 | ||
631 | min keysize : 16 | ||
632 | max keysize : 32 | ||
633 | ivsize : 0 | ||
634 | chunksize : 16 | ||
635 | walksize : 16 | ||
636 | |||
637 | name : __generic-gcm-aes-aesni | ||
638 | driver : cryptd(__driver-generic-gcm-aes-aesni) | ||
639 | module : kernel | ||
640 | priority : 50 | ||
641 | refcnt : 1 | ||
642 | selftest : passed | ||
643 | internal : yes | ||
644 | type : aead | ||
645 | async : yes | ||
646 | blocksize : 1 | ||
647 | ivsize : 12 | ||
648 | maxauthsize : 16 | ||
649 | geniv : <none> | ||
650 | |||
651 | name : gcm(aes) | ||
652 | driver : generic-gcm-aesni | ||
653 | module : kernel | ||
654 | priority : 400 | ||
655 | refcnt : 1 | ||
656 | selftest : passed | ||
657 | internal : no | ||
658 | type : aead | ||
659 | async : yes | ||
660 | blocksize : 1 | ||
661 | ivsize : 12 | ||
662 | maxauthsize : 16 | ||
663 | geniv : <none> | ||
664 | |||
665 | name : __generic-gcm-aes-aesni | ||
666 | driver : __driver-generic-gcm-aes-aesni | ||
667 | module : kernel | ||
668 | priority : 0 | ||
669 | refcnt : 1 | ||
670 | selftest : passed | ||
671 | internal : yes | ||
672 | type : aead | ||
673 | async : no | ||
674 | blocksize : 1 | ||
675 | ivsize : 12 | ||
676 | maxauthsize : 16 | ||
677 | geniv : <none> | ||
678 | |||
679 | name : __gcm-aes-aesni | ||
680 | driver : cryptd(__driver-gcm-aes-aesni) | ||
681 | module : kernel | ||
682 | priority : 50 | ||
683 | refcnt : 1 | ||
684 | selftest : passed | ||
685 | internal : yes | ||
686 | type : aead | ||
687 | async : yes | ||
688 | blocksize : 1 | ||
689 | ivsize : 8 | ||
690 | maxauthsize : 16 | ||
691 | geniv : <none> | ||
692 | |||
693 | name : rfc4106(gcm(aes)) | ||
694 | driver : rfc4106-gcm-aesni | ||
695 | module : kernel | ||
696 | priority : 400 | ||
697 | refcnt : 1 | ||
698 | selftest : passed | ||
699 | internal : no | ||
700 | type : aead | ||
701 | async : yes | ||
702 | blocksize : 1 | ||
703 | ivsize : 8 | ||
704 | maxauthsize : 16 | ||
705 | geniv : <none> | ||
706 | |||
707 | name : __gcm-aes-aesni | ||
708 | driver : __driver-gcm-aes-aesni | ||
709 | module : kernel | ||
710 | priority : 0 | ||
711 | refcnt : 1 | ||
712 | selftest : passed | ||
713 | internal : yes | ||
714 | type : aead | ||
715 | async : no | ||
716 | blocksize : 1 | ||
717 | ivsize : 8 | ||
718 | maxauthsize : 16 | ||
719 | geniv : <none> | ||
720 | |||
721 | name : __xts(aes) | ||
722 | driver : __xts-aes-aesni | ||
723 | module : kernel | ||
724 | priority : 401 | ||
725 | refcnt : 1 | ||
726 | selftest : passed | ||
727 | internal : yes | ||
728 | type : skcipher | ||
729 | async : no | ||
730 | blocksize : 16 | ||
731 | min keysize : 32 | ||
732 | max keysize : 64 | ||
733 | ivsize : 16 | ||
734 | chunksize : 16 | ||
735 | walksize : 16 | ||
736 | |||
737 | name : __ctr(aes) | ||
738 | driver : __ctr-aes-aesni | ||
739 | module : kernel | ||
740 | priority : 400 | ||
741 | refcnt : 1 | ||
742 | selftest : passed | ||
743 | internal : yes | ||
744 | type : skcipher | ||
745 | async : no | ||
746 | blocksize : 1 | ||
747 | min keysize : 16 | ||
748 | max keysize : 32 | ||
749 | ivsize : 16 | ||
750 | chunksize : 16 | ||
751 | walksize : 16 | ||
752 | |||
753 | name : __cbc(aes) | ||
754 | driver : __cbc-aes-aesni | ||
755 | module : kernel | ||
756 | priority : 400 | ||
757 | refcnt : 1 | ||
758 | selftest : passed | ||
759 | internal : yes | ||
760 | type : skcipher | ||
761 | async : no | ||
762 | blocksize : 16 | ||
763 | min keysize : 16 | ||
764 | max keysize : 32 | ||
765 | ivsize : 16 | ||
766 | chunksize : 16 | ||
767 | walksize : 16 | ||
768 | |||
769 | name : __ecb(aes) | ||
770 | driver : __ecb-aes-aesni | ||
771 | module : kernel | ||
772 | priority : 400 | ||
773 | refcnt : 1 | ||
774 | selftest : passed | ||
775 | internal : yes | ||
776 | type : skcipher | ||
777 | async : no | ||
778 | blocksize : 16 | ||
779 | min keysize : 16 | ||
780 | max keysize : 32 | ||
781 | ivsize : 0 | ||
782 | chunksize : 16 | ||
783 | walksize : 16 | ||
784 | |||
785 | name : __aes | ||
786 | driver : __aes-aesni | ||
787 | module : kernel | ||
788 | priority : 300 | ||
789 | refcnt : 1 | ||
790 | selftest : passed | ||
791 | internal : yes | ||
792 | type : cipher | ||
793 | blocksize : 16 | ||
794 | min keysize : 16 | ||
795 | max keysize : 32 | ||
796 | |||
797 | name : aes | ||
798 | driver : aes-aesni | ||
799 | module : kernel | ||
800 | priority : 300 | ||
801 | refcnt : 8 | ||
802 | selftest : passed | ||
803 | internal : no | ||
804 | type : cipher | ||
805 | blocksize : 16 | ||
806 | min keysize : 16 | ||
807 | max keysize : 32 | ||
808 | |||
809 | name : hmac(sha1) | ||
810 | driver : hmac(sha1-generic) | ||
811 | module : kernel | ||
812 | priority : 100 | ||
813 | refcnt : 9 | ||
814 | selftest : passed | ||
815 | internal : no | ||
816 | type : shash | ||
817 | blocksize : 64 | ||
818 | digestsize : 20 | ||
819 | |||
820 | name : ghash | ||
821 | driver : ghash-generic | ||
822 | module : kernel | ||
823 | priority : 100 | ||
824 | refcnt : 3 | ||
825 | selftest : passed | ||
826 | internal : no | ||
827 | type : shash | ||
828 | blocksize : 16 | ||
829 | digestsize : 16 | ||
830 | |||
831 | name : jitterentropy_rng | ||
832 | driver : jitterentropy_rng | ||
833 | module : kernel | ||
834 | priority : 100 | ||
835 | refcnt : 1 | ||
836 | selftest : passed | ||
837 | internal : no | ||
838 | type : rng | ||
839 | seedsize : 0 | ||
840 | |||
841 | name : stdrng | ||
842 | driver : drbg_nopr_hmac_sha256 | ||
843 | module : kernel | ||
844 | priority : 221 | ||
845 | refcnt : 2 | ||
846 | selftest : passed | ||
847 | internal : no | ||
848 | type : rng | ||
849 | seedsize : 0 | ||
850 | |||
851 | name : stdrng | ||
852 | driver : drbg_nopr_hmac_sha512 | ||
853 | module : kernel | ||
854 | priority : 220 | ||
855 | refcnt : 1 | ||
856 | selftest : passed | ||
857 | internal : no | ||
858 | type : rng | ||
859 | seedsize : 0 | ||
860 | |||
861 | name : stdrng | ||
862 | driver : drbg_nopr_hmac_sha384 | ||
863 | module : kernel | ||
864 | priority : 219 | ||
865 | refcnt : 1 | ||
866 | selftest : passed | ||
867 | internal : no | ||
868 | type : rng | ||
869 | seedsize : 0 | ||
870 | |||
871 | name : stdrng | ||
872 | driver : drbg_nopr_hmac_sha1 | ||
873 | module : kernel | ||
874 | priority : 218 | ||
875 | refcnt : 1 | ||
876 | selftest : passed | ||
877 | internal : no | ||
878 | type : rng | ||
879 | seedsize : 0 | ||
880 | |||
881 | name : stdrng | ||
882 | driver : drbg_nopr_sha256 | ||
883 | module : kernel | ||
884 | priority : 217 | ||
885 | refcnt : 1 | ||
886 | selftest : passed | ||
887 | internal : no | ||
888 | type : rng | ||
889 | seedsize : 0 | ||
890 | |||
891 | name : stdrng | ||
892 | driver : drbg_nopr_sha512 | ||
893 | module : kernel | ||
894 | priority : 216 | ||
895 | refcnt : 1 | ||
896 | selftest : passed | ||
897 | internal : no | ||
898 | type : rng | ||
899 | seedsize : 0 | ||
900 | |||
901 | name : stdrng | ||
902 | driver : drbg_nopr_sha384 | ||
903 | module : kernel | ||
904 | priority : 215 | ||
905 | refcnt : 1 | ||
906 | selftest : passed | ||
907 | internal : no | ||
908 | type : rng | ||
909 | seedsize : 0 | ||
910 | |||
911 | name : stdrng | ||
912 | driver : drbg_nopr_sha1 | ||
913 | module : kernel | ||
914 | priority : 214 | ||
915 | refcnt : 1 | ||
916 | selftest : passed | ||
917 | internal : no | ||
918 | type : rng | ||
919 | seedsize : 0 | ||
920 | |||
921 | name : stdrng | ||
922 | driver : drbg_nopr_ctr_aes256 | ||
923 | module : kernel | ||
924 | priority : 213 | ||
925 | refcnt : 1 | ||
926 | selftest : passed | ||
927 | internal : no | ||
928 | type : rng | ||
929 | seedsize : 0 | ||
930 | |||
931 | name : stdrng | ||
932 | driver : drbg_nopr_ctr_aes192 | ||
933 | module : kernel | ||
934 | priority : 212 | ||
935 | refcnt : 1 | ||
936 | selftest : passed | ||
937 | internal : no | ||
938 | type : rng | ||
939 | seedsize : 0 | ||
940 | |||
941 | name : stdrng | ||
942 | driver : drbg_nopr_ctr_aes128 | ||
943 | module : kernel | ||
944 | priority : 211 | ||
945 | refcnt : 1 | ||
946 | selftest : passed | ||
947 | internal : no | ||
948 | type : rng | ||
949 | seedsize : 0 | ||
950 | |||
951 | name : hmac(sha256) | ||
952 | driver : hmac(sha256-generic) | ||
953 | module : kernel | ||
954 | priority : 100 | ||
955 | refcnt : 10 | ||
956 | selftest : passed | ||
957 | internal : no | ||
958 | type : shash | ||
959 | blocksize : 64 | ||
960 | digestsize : 32 | ||
961 | |||
962 | name : stdrng | ||
963 | driver : drbg_pr_hmac_sha256 | ||
964 | module : kernel | ||
965 | priority : 210 | ||
966 | refcnt : 1 | ||
967 | selftest : passed | ||
968 | internal : no | ||
969 | type : rng | ||
970 | seedsize : 0 | ||
971 | |||
972 | name : stdrng | ||
973 | driver : drbg_pr_hmac_sha512 | ||
974 | module : kernel | ||
975 | priority : 209 | ||
976 | refcnt : 1 | ||
977 | selftest : passed | ||
978 | internal : no | ||
979 | type : rng | ||
980 | seedsize : 0 | ||
981 | |||
982 | name : stdrng | ||
983 | driver : drbg_pr_hmac_sha384 | ||
984 | module : kernel | ||
985 | priority : 208 | ||
986 | refcnt : 1 | ||
987 | selftest : passed | ||
988 | internal : no | ||
989 | type : rng | ||
990 | seedsize : 0 | ||
991 | |||
992 | name : stdrng | ||
993 | driver : drbg_pr_hmac_sha1 | ||
994 | module : kernel | ||
995 | priority : 207 | ||
996 | refcnt : 1 | ||
997 | selftest : passed | ||
998 | internal : no | ||
999 | type : rng | ||
1000 | seedsize : 0 | ||
1001 | |||
1002 | name : stdrng | ||
1003 | driver : drbg_pr_sha256 | ||
1004 | module : kernel | ||
1005 | priority : 206 | ||
1006 | refcnt : 1 | ||
1007 | selftest : passed | ||
1008 | internal : no | ||
1009 | type : rng | ||
1010 | seedsize : 0 | ||
1011 | |||
1012 | name : stdrng | ||
1013 | driver : drbg_pr_sha512 | ||
1014 | module : kernel | ||
1015 | priority : 205 | ||
1016 | refcnt : 1 | ||
1017 | selftest : passed | ||
1018 | internal : no | ||
1019 | type : rng | ||
1020 | seedsize : 0 | ||
1021 | |||
1022 | name : stdrng | ||
1023 | driver : drbg_pr_sha384 | ||
1024 | module : kernel | ||
1025 | priority : 204 | ||
1026 | refcnt : 1 | ||
1027 | selftest : passed | ||
1028 | internal : no | ||
1029 | type : rng | ||
1030 | seedsize : 0 | ||
1031 | |||
1032 | name : stdrng | ||
1033 | driver : drbg_pr_sha1 | ||
1034 | module : kernel | ||
1035 | priority : 203 | ||
1036 | refcnt : 1 | ||
1037 | selftest : passed | ||
1038 | internal : no | ||
1039 | type : rng | ||
1040 | seedsize : 0 | ||
1041 | |||
1042 | name : stdrng | ||
1043 | driver : drbg_pr_ctr_aes256 | ||
1044 | module : kernel | ||
1045 | priority : 202 | ||
1046 | refcnt : 1 | ||
1047 | selftest : passed | ||
1048 | internal : no | ||
1049 | type : rng | ||
1050 | seedsize : 0 | ||
1051 | |||
1052 | name : stdrng | ||
1053 | driver : drbg_pr_ctr_aes192 | ||
1054 | module : kernel | ||
1055 | priority : 201 | ||
1056 | refcnt : 1 | ||
1057 | selftest : passed | ||
1058 | internal : no | ||
1059 | type : rng | ||
1060 | seedsize : 0 | ||
1061 | |||
1062 | name : stdrng | ||
1063 | driver : drbg_pr_ctr_aes128 | ||
1064 | module : kernel | ||
1065 | priority : 200 | ||
1066 | refcnt : 1 | ||
1067 | selftest : passed | ||
1068 | internal : no | ||
1069 | type : rng | ||
1070 | seedsize : 0 | ||
1071 | |||
1072 | name : 842 | ||
1073 | driver : 842-scomp | ||
1074 | module : kernel | ||
1075 | priority : 100 | ||
1076 | refcnt : 1 | ||
1077 | selftest : passed | ||
1078 | internal : no | ||
1079 | type : scomp | ||
1080 | |||
1081 | name : 842 | ||
1082 | driver : 842-generic | ||
1083 | module : kernel | ||
1084 | priority : 100 | ||
1085 | refcnt : 1 | ||
1086 | selftest : passed | ||
1087 | internal : no | ||
1088 | type : compression | ||
1089 | |||
1090 | name : lzo-rle | ||
1091 | driver : lzo-rle-scomp | ||
1092 | module : kernel | ||
1093 | priority : 0 | ||
1094 | refcnt : 1 | ||
1095 | selftest : passed | ||
1096 | internal : no | ||
1097 | type : scomp | ||
1098 | |||
1099 | name : lzo-rle | ||
1100 | driver : lzo-rle-generic | ||
1101 | module : kernel | ||
1102 | priority : 0 | ||
1103 | refcnt : 1 | ||
1104 | selftest : passed | ||
1105 | internal : no | ||
1106 | type : compression | ||
1107 | |||
1108 | name : lzo | ||
1109 | driver : lzo-scomp | ||
1110 | module : kernel | ||
1111 | priority : 0 | ||
1112 | refcnt : 1 | ||
1113 | selftest : passed | ||
1114 | internal : no | ||
1115 | type : scomp | ||
1116 | |||
1117 | name : lzo | ||
1118 | driver : lzo-generic | ||
1119 | module : kernel | ||
1120 | priority : 0 | ||
1121 | refcnt : 9 | ||
1122 | selftest : passed | ||
1123 | internal : no | ||
1124 | type : compression | ||
1125 | |||
1126 | name : crct10dif | ||
1127 | driver : crct10dif-generic | ||
1128 | module : kernel | ||
1129 | priority : 100 | ||
1130 | refcnt : 1 | ||
1131 | selftest : passed | ||
1132 | internal : no | ||
1133 | type : shash | ||
1134 | blocksize : 1 | ||
1135 | digestsize : 2 | ||
1136 | |||
1137 | name : crc32c | ||
1138 | driver : crc32c-generic | ||
1139 | module : kernel | ||
1140 | priority : 100 | ||
1141 | refcnt : 1 | ||
1142 | selftest : passed | ||
1143 | internal : no | ||
1144 | type : shash | ||
1145 | blocksize : 1 | ||
1146 | digestsize : 4 | ||
1147 | |||
1148 | name : zlib-deflate | ||
1149 | driver : zlib-deflate-scomp | ||
1150 | module : kernel | ||
1151 | priority : 0 | ||
1152 | refcnt : 1 | ||
1153 | selftest : passed | ||
1154 | internal : no | ||
1155 | type : scomp | ||
1156 | |||
1157 | name : deflate | ||
1158 | driver : deflate-scomp | ||
1159 | module : kernel | ||
1160 | priority : 0 | ||
1161 | refcnt : 1 | ||
1162 | selftest : passed | ||
1163 | internal : no | ||
1164 | type : scomp | ||
1165 | |||
1166 | name : deflate | ||
1167 | driver : deflate-generic | ||
1168 | module : kernel | ||
1169 | priority : 0 | ||
1170 | refcnt : 1 | ||
1171 | selftest : passed | ||
1172 | internal : no | ||
1173 | type : compression | ||
1174 | |||
1175 | name : aes | ||
1176 | driver : aes-generic | ||
1177 | module : kernel | ||
1178 | priority : 100 | ||
1179 | refcnt : 1 | ||
1180 | selftest : passed | ||
1181 | internal : no | ||
1182 | type : cipher | ||
1183 | blocksize : 16 | ||
1184 | min keysize : 16 | ||
1185 | max keysize : 32 | ||
1186 | |||
1187 | name : sha224 | ||
1188 | driver : sha224-generic | ||
1189 | module : kernel | ||
1190 | priority : 100 | ||
1191 | refcnt : 1 | ||
1192 | selftest : passed | ||
1193 | internal : no | ||
1194 | type : shash | ||
1195 | blocksize : 64 | ||
1196 | digestsize : 28 | ||
1197 | |||
1198 | name : sha256 | ||
1199 | driver : sha256-generic | ||
1200 | module : kernel | ||
1201 | priority : 100 | ||
1202 | refcnt : 11 | ||
1203 | selftest : passed | ||
1204 | internal : no | ||
1205 | type : shash | ||
1206 | blocksize : 64 | ||
1207 | digestsize : 32 | ||
1208 | |||
1209 | name : sha1 | ||
1210 | driver : sha1-generic | ||
1211 | module : kernel | ||
1212 | priority : 100 | ||
1213 | refcnt : 11 | ||
1214 | selftest : passed | ||
1215 | internal : no | ||
1216 | type : shash | ||
1217 | blocksize : 64 | ||
1218 | digestsize : 20 | ||
1219 | |||
1220 | name : md5 | ||
1221 | driver : md5-generic | ||
1222 | module : kernel | ||
1223 | priority : 0 | ||
1224 | refcnt : 1 | ||
1225 | selftest : passed | ||
1226 | internal : no | ||
1227 | type : shash | ||
1228 | blocksize : 64 | ||
1229 | digestsize : 16 | ||
1230 | |||
1231 | name : ecb(cipher_null) | ||
1232 | driver : ecb-cipher_null | ||
1233 | module : kernel | ||
1234 | priority : 100 | ||
1235 | refcnt : 1 | ||
1236 | selftest : passed | ||
1237 | internal : no | ||
1238 | type : skcipher | ||
1239 | async : no | ||
1240 | blocksize : 1 | ||
1241 | min keysize : 0 | ||
1242 | max keysize : 0 | ||
1243 | ivsize : 0 | ||
1244 | chunksize : 1 | ||
1245 | walksize : 1 | ||
1246 | |||
1247 | name : digest_null | ||
1248 | driver : digest_null-generic | ||
1249 | module : kernel | ||
1250 | priority : 0 | ||
1251 | refcnt : 1 | ||
1252 | selftest : passed | ||
1253 | internal : no | ||
1254 | type : shash | ||
1255 | blocksize : 1 | ||
1256 | digestsize : 0 | ||
1257 | |||
1258 | name : compress_null | ||
1259 | driver : compress_null-generic | ||
1260 | module : kernel | ||
1261 | priority : 0 | ||
1262 | refcnt : 1 | ||
1263 | selftest : passed | ||
1264 | internal : no | ||
1265 | type : compression | ||
1266 | |||
1267 | name : cipher_null | ||
1268 | driver : cipher_null-generic | ||
1269 | module : kernel | ||
1270 | priority : 0 | ||
1271 | refcnt : 1 | ||
1272 | selftest : passed | ||
1273 | internal : no | ||
1274 | type : cipher | ||
1275 | blocksize : 1 | ||
1276 | min keysize : 0 | ||
1277 | max keysize : 0 | ||
1278 | |||
1279 | name : rsa | ||
1280 | driver : rsa-generic | ||
1281 | module : kernel | ||
1282 | priority : 100 | ||
1283 | refcnt : 1 | ||
1284 | selftest : passed | ||
1285 | internal : no | ||
1286 | type : akcipher | ||
1287 | |||
1288 | name : dh | ||
1289 | driver : dh-generic | ||
1290 | module : kernel | ||
1291 | priority : 100 | ||
1292 | refcnt : 1 | ||
1293 | selftest : passed | ||
1294 | internal : no | ||
1295 | type : kpp | ||
1296 | |||
1297 | name : aes | ||
1298 | driver : aes-asm | ||
1299 | module : kernel | ||
1300 | priority : 200 | ||
1301 | refcnt : 1 | ||
1302 | selftest : passed | ||
1303 | internal : no | ||
1304 | type : cipher | ||
1305 | blocksize : 16 | ||
1306 | min keysize : 16 | ||
1307 | max keysize : 32 | ||
1308 | |||
1309 | Mode: 444 | ||
1310 | # ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - | ||
336 | Path: fixtures/proc/diskstats | 1311 | Path: fixtures/proc/diskstats |
337 | Lines: 49 | 1312 | Lines: 49 |
338 | 1 0 ram0 0 0 0 0 0 0 0 0 0 0 0 | 1313 | 1 0 ram0 0 0 0 0 0 0 0 0 0 0 0 |
@@ -482,6 +1457,12 @@ Mode: 644 | |||
482 | Directory: fixtures/proc/net | 1457 | Directory: fixtures/proc/net |
483 | Mode: 755 | 1458 | Mode: 755 |
484 | # ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - | 1459 | # ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - |
1460 | Path: fixtures/proc/net/arp | ||
1461 | Lines: 2 | ||
1462 | IP address HW type Flags HW address Mask Device | ||
1463 | 192.168.224.1 0x1 0x2 00:50:56:c0:00:08 * ens33 | ||
1464 | Mode: 664 | ||
1465 | # ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - | ||
485 | Path: fixtures/proc/net/dev | 1466 | Path: fixtures/proc/net/dev |
486 | Lines: 6 | 1467 | Lines: 6 |
487 | Inter-| Receive | Transmit | 1468 | Inter-| Receive | Transmit |
@@ -554,6 +1535,11 @@ proc4 2 2 10853 | |||
554 | proc4ops 72 0 0 0 1098 2 0 0 0 0 8179 5896 0 0 0 0 5900 0 0 2 0 2 0 9609 0 2 150 1272 0 0 0 1236 0 0 0 0 3 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 | 1535 | proc4ops 72 0 0 0 1098 2 0 0 0 0 8179 5896 0 0 0 0 5900 0 0 2 0 2 0 9609 0 2 150 1272 0 0 0 1236 0 0 0 0 3 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 |
555 | Mode: 644 | 1536 | Mode: 644 |
556 | # ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - | 1537 | # ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - |
1538 | Path: fixtures/proc/net/softnet_stat | ||
1539 | Lines: 1 | ||
1540 | 00015c73 00020e76 F0000769 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000 | ||
1541 | Mode: 644 | ||
1542 | # ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - | ||
557 | Path: fixtures/proc/net/unix | 1543 | Path: fixtures/proc/net/unix |
558 | Lines: 6 | 1544 | Lines: 6 |
559 | Num RefCount Protocol Flags Type St Inode Path | 1545 | Num RefCount Protocol Flags Type St Inode Path |
@@ -1701,6 +2687,42 @@ Mode: 444 | |||
1701 | Directory: fixtures/sys/class/thermal | 2687 | Directory: fixtures/sys/class/thermal |
1702 | Mode: 775 | 2688 | Mode: 775 |
1703 | # ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - | 2689 | # ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - |
2690 | Directory: fixtures/sys/class/thermal/cooling_device0 | ||
2691 | Mode: 755 | ||
2692 | # ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - | ||
2693 | Path: fixtures/sys/class/thermal/cooling_device0/cur_state | ||
2694 | Lines: 1 | ||
2695 | 0 | ||
2696 | Mode: 644 | ||
2697 | # ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - | ||
2698 | Path: fixtures/sys/class/thermal/cooling_device0/max_state | ||
2699 | Lines: 1 | ||
2700 | 50 | ||
2701 | Mode: 644 | ||
2702 | # ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - | ||
2703 | Path: fixtures/sys/class/thermal/cooling_device0/type | ||
2704 | Lines: 1 | ||
2705 | Processor | ||
2706 | Mode: 644 | ||
2707 | # ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - | ||
2708 | Directory: fixtures/sys/class/thermal/cooling_device1 | ||
2709 | Mode: 755 | ||
2710 | # ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - | ||
2711 | Path: fixtures/sys/class/thermal/cooling_device1/cur_state | ||
2712 | Lines: 1 | ||
2713 | -1 | ||
2714 | Mode: 644 | ||
2715 | # ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - | ||
2716 | Path: fixtures/sys/class/thermal/cooling_device1/max_state | ||
2717 | Lines: 1 | ||
2718 | 27 | ||
2719 | Mode: 644 | ||
2720 | # ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - | ||
2721 | Path: fixtures/sys/class/thermal/cooling_device1/type | ||
2722 | Lines: 1 | ||
2723 | intel_powerclamp | ||
2724 | Mode: 644 | ||
2725 | # ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - | ||
1704 | Directory: fixtures/sys/class/thermal/thermal_zone0 | 2726 | Directory: fixtures/sys/class/thermal/thermal_zone0 |
1705 | Mode: 775 | 2727 | Mode: 775 |
1706 | # ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - | 2728 | # ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - |
diff --git a/vendor/github.com/prometheus/procfs/sysfs/net_class.go b/vendor/github.com/prometheus/procfs/sysfs/net_class.go index 909f7fb..d5c0d6a 100644 --- a/vendor/github.com/prometheus/procfs/sysfs/net_class.go +++ b/vendor/github.com/prometheus/procfs/sysfs/net_class.go | |||
@@ -18,11 +18,7 @@ package sysfs | |||
18 | import ( | 18 | import ( |
19 | "fmt" | 19 | "fmt" |
20 | "io/ioutil" | 20 | "io/ioutil" |
21 | "os" | ||
22 | "path/filepath" | 21 | "path/filepath" |
23 | "reflect" | ||
24 | "strconv" | ||
25 | "strings" | ||
26 | 22 | ||
27 | "github.com/prometheus/procfs/internal/util" | 23 | "github.com/prometheus/procfs/internal/util" |
28 | ) | 24 | ) |
@@ -33,32 +29,32 @@ const netclassPath = "class/net" | |||
33 | // for single interface (iface). | 29 | // for single interface (iface). |
34 | type NetClassIface struct { | 30 | type NetClassIface struct { |
35 | Name string // Interface name | 31 | Name string // Interface name |
36 | AddrAssignType *int64 `fileName:"addr_assign_type"` // /sys/class/net/<iface>/addr_assign_type | 32 | AddrAssignType *int64 // /sys/class/net/<iface>/addr_assign_type |
37 | AddrLen *int64 `fileName:"addr_len"` // /sys/class/net/<iface>/addr_len | 33 | AddrLen *int64 // /sys/class/net/<iface>/addr_len |
38 | Address string `fileName:"address"` // /sys/class/net/<iface>/address | 34 | Address string // /sys/class/net/<iface>/address |
39 | Broadcast string `fileName:"broadcast"` // /sys/class/net/<iface>/broadcast | 35 | Broadcast string // /sys/class/net/<iface>/broadcast |
40 | Carrier *int64 `fileName:"carrier"` // /sys/class/net/<iface>/carrier | 36 | Carrier *int64 // /sys/class/net/<iface>/carrier |
41 | CarrierChanges *int64 `fileName:"carrier_changes"` // /sys/class/net/<iface>/carrier_changes | 37 | CarrierChanges *int64 // /sys/class/net/<iface>/carrier_changes |
42 | CarrierUpCount *int64 `fileName:"carrier_up_count"` // /sys/class/net/<iface>/carrier_up_count | 38 | CarrierUpCount *int64 // /sys/class/net/<iface>/carrier_up_count |
43 | CarrierDownCount *int64 `fileName:"carrier_down_count"` // /sys/class/net/<iface>/carrier_down_count | 39 | CarrierDownCount *int64 // /sys/class/net/<iface>/carrier_down_count |
44 | DevID *int64 `fileName:"dev_id"` // /sys/class/net/<iface>/dev_id | 40 | DevID *int64 // /sys/class/net/<iface>/dev_id |
45 | Dormant *int64 `fileName:"dormant"` // /sys/class/net/<iface>/dormant | 41 | Dormant *int64 // /sys/class/net/<iface>/dormant |
46 | Duplex string `fileName:"duplex"` // /sys/class/net/<iface>/duplex | 42 | Duplex string // /sys/class/net/<iface>/duplex |
47 | Flags *int64 `fileName:"flags"` // /sys/class/net/<iface>/flags | 43 | Flags *int64 // /sys/class/net/<iface>/flags |
48 | IfAlias string `fileName:"ifalias"` // /sys/class/net/<iface>/ifalias | 44 | IfAlias string // /sys/class/net/<iface>/ifalias |
49 | IfIndex *int64 `fileName:"ifindex"` // /sys/class/net/<iface>/ifindex | 45 | IfIndex *int64 // /sys/class/net/<iface>/ifindex |
50 | IfLink *int64 `fileName:"iflink"` // /sys/class/net/<iface>/iflink | 46 | IfLink *int64 // /sys/class/net/<iface>/iflink |
51 | LinkMode *int64 `fileName:"link_mode"` // /sys/class/net/<iface>/link_mode | 47 | LinkMode *int64 // /sys/class/net/<iface>/link_mode |
52 | MTU *int64 `fileName:"mtu"` // /sys/class/net/<iface>/mtu | 48 | MTU *int64 // /sys/class/net/<iface>/mtu |
53 | NameAssignType *int64 `fileName:"name_assign_type"` // /sys/class/net/<iface>/name_assign_type | 49 | NameAssignType *int64 // /sys/class/net/<iface>/name_assign_type |
54 | NetDevGroup *int64 `fileName:"netdev_group"` // /sys/class/net/<iface>/netdev_group | 50 | NetDevGroup *int64 // /sys/class/net/<iface>/netdev_group |
55 | OperState string `fileName:"operstate"` // /sys/class/net/<iface>/operstate | 51 | OperState string // /sys/class/net/<iface>/operstate |
56 | PhysPortID string `fileName:"phys_port_id"` // /sys/class/net/<iface>/phys_port_id | 52 | PhysPortID string // /sys/class/net/<iface>/phys_port_id |
57 | PhysPortName string `fileName:"phys_port_name"` // /sys/class/net/<iface>/phys_port_name | 53 | PhysPortName string // /sys/class/net/<iface>/phys_port_name |
58 | PhysSwitchID string `fileName:"phys_switch_id"` // /sys/class/net/<iface>/phys_switch_id | 54 | PhysSwitchID string // /sys/class/net/<iface>/phys_switch_id |
59 | Speed *int64 `fileName:"speed"` // /sys/class/net/<iface>/speed | 55 | Speed *int64 // /sys/class/net/<iface>/speed |
60 | TxQueueLen *int64 `fileName:"tx_queue_len"` // /sys/class/net/<iface>/tx_queue_len | 56 | TxQueueLen *int64 // /sys/class/net/<iface>/tx_queue_len |
61 | Type *int64 `fileName:"type"` // /sys/class/net/<iface>/type | 57 | Type *int64 // /sys/class/net/<iface>/type |
62 | } | 58 | } |
63 | 59 | ||
64 | // NetClass is collection of info for every interface (iface) in /sys/class/net. The map keys | 60 | // NetClass is collection of info for every interface (iface) in /sys/class/net. The map keys |
@@ -109,54 +105,77 @@ func (fs FS) NetClass() (NetClass, error) { | |||
109 | // directory and gets their contents. | 105 | // directory and gets their contents. |
110 | func (nc NetClass) parseNetClassIface(devicePath string) (*NetClassIface, error) { | 106 | func (nc NetClass) parseNetClassIface(devicePath string) (*NetClassIface, error) { |
111 | interfaceClass := NetClassIface{} | 107 | interfaceClass := NetClassIface{} |
112 | interfaceElem := reflect.ValueOf(&interfaceClass).Elem() | ||
113 | interfaceType := reflect.TypeOf(interfaceClass) | ||
114 | 108 | ||
115 | //start from 1 - skip the Name field | 109 | files, err := ioutil.ReadDir(devicePath) |
116 | for i := 1; i < interfaceElem.NumField(); i++ { | 110 | if err != nil { |
117 | fieldType := interfaceType.Field(i) | 111 | return nil, err |
118 | fieldValue := interfaceElem.Field(i) | 112 | } |
119 | 113 | ||
120 | if fieldType.Tag.Get("fileName") == "" { | 114 | for _, f := range files { |
121 | panic(fmt.Errorf("field %s does not have a filename tag", fieldType.Name)) | 115 | if f.IsDir() { |
116 | continue | ||
122 | } | 117 | } |
123 | 118 | name := filepath.Join(devicePath, f.Name()) | |
124 | value, err := util.SysReadFile(devicePath + "/" + fieldType.Tag.Get("fileName")) | 119 | value, err := util.SysReadFile(name) |
125 | |||
126 | if err != nil { | 120 | if err != nil { |
127 | if os.IsNotExist(err) || err.Error() == "operation not supported" || err.Error() == "invalid argument" { | 121 | return nil, fmt.Errorf("failed to read file %q: %v", name, err) |
128 | continue | ||
129 | } | ||
130 | return nil, fmt.Errorf("could not access file %s: %s", fieldType.Tag.Get("fileName"), err) | ||
131 | } | 122 | } |
132 | 123 | vp := util.NewValueParser(value) | |
133 | switch fieldValue.Kind() { | 124 | switch f.Name() { |
134 | case reflect.String: | 125 | case "addr_assign_type": |
135 | fieldValue.SetString(value) | 126 | interfaceClass.AddrAssignType = vp.PInt64() |
136 | case reflect.Ptr: | 127 | case "addr_len": |
137 | var int64ptr *int64 | 128 | interfaceClass.AddrLen = vp.PInt64() |
138 | switch fieldValue.Type() { | 129 | case "address": |
139 | case reflect.TypeOf(int64ptr): | 130 | interfaceClass.Address = value |
140 | var intValue int64 | 131 | case "broadcast": |
141 | if strings.HasPrefix(value, "0x") { | 132 | interfaceClass.Broadcast = value |
142 | intValue, err = strconv.ParseInt(value[2:], 16, 64) | 133 | case "carrier": |
143 | if err != nil { | 134 | interfaceClass.Carrier = vp.PInt64() |
144 | return nil, fmt.Errorf("expected hex value for %s, got: %s", fieldType.Name, value) | 135 | case "carrier_changes": |
145 | } | 136 | interfaceClass.CarrierChanges = vp.PInt64() |
146 | } else { | 137 | case "carrier_up_count": |
147 | intValue, err = strconv.ParseInt(value, 10, 64) | 138 | interfaceClass.CarrierUpCount = vp.PInt64() |
148 | if err != nil { | 139 | case "carrier_down_count": |
149 | return nil, fmt.Errorf("expected Uint64 value for %s, got: %s", fieldType.Name, value) | 140 | interfaceClass.CarrierDownCount = vp.PInt64() |
150 | } | 141 | case "dev_id": |
151 | } | 142 | interfaceClass.DevID = vp.PInt64() |
152 | fieldValue.Set(reflect.ValueOf(&intValue)) | 143 | case "dormant": |
153 | default: | 144 | interfaceClass.Dormant = vp.PInt64() |
154 | return nil, fmt.Errorf("unhandled pointer type %q", fieldValue.Type()) | 145 | case "duplex": |
155 | } | 146 | interfaceClass.Duplex = value |
156 | default: | 147 | case "flags": |
157 | return nil, fmt.Errorf("unhandled type %q", fieldValue.Kind()) | 148 | interfaceClass.Flags = vp.PInt64() |
149 | case "ifalias": | ||
150 | interfaceClass.IfAlias = value | ||
151 | case "ifindex": | ||
152 | interfaceClass.IfIndex = vp.PInt64() | ||
153 | case "iflink": | ||
154 | interfaceClass.IfLink = vp.PInt64() | ||
155 | case "link_mode": | ||
156 | interfaceClass.LinkMode = vp.PInt64() | ||
157 | case "mtu": | ||
158 | interfaceClass.MTU = vp.PInt64() | ||
159 | case "name_assign_type": | ||
160 | interfaceClass.NameAssignType = vp.PInt64() | ||
161 | case "netdev_group": | ||
162 | interfaceClass.NetDevGroup = vp.PInt64() | ||
163 | case "operstate": | ||
164 | interfaceClass.OperState = value | ||
165 | case "phys_port_id": | ||
166 | interfaceClass.PhysPortID = value | ||
167 | case "phys_port_name": | ||
168 | interfaceClass.PhysPortName = value | ||
169 | case "phys_switch_id": | ||
170 | interfaceClass.PhysSwitchID = value | ||
171 | case "speed": | ||
172 | interfaceClass.Speed = vp.PInt64() | ||
173 | case "tx_queue_len": | ||
174 | interfaceClass.TxQueueLen = vp.PInt64() | ||
175 | case "type": | ||
176 | interfaceClass.Type = vp.PInt64() | ||
158 | } | 177 | } |
159 | } | 178 | } |
160 | |||
161 | return &interfaceClass, nil | 179 | return &interfaceClass, nil |
180 | |||
162 | } | 181 | } |
diff --git a/vendor/github.com/prometheus/procfs/vm.go b/vendor/github.com/prometheus/procfs/vm.go index f22651c..cb13891 100644 --- a/vendor/github.com/prometheus/procfs/vm.go +++ b/vendor/github.com/prometheus/procfs/vm.go | |||
@@ -31,49 +31,49 @@ import ( | |||
31 | // Each file contains one line with a single numerical value, except lowmem_reserve_ratio which holds an array | 31 | // Each file contains one line with a single numerical value, except lowmem_reserve_ratio which holds an array |
32 | // and numa_zonelist_order (deprecated) which is a string | 32 | // and numa_zonelist_order (deprecated) which is a string |
33 | type VM struct { | 33 | type VM struct { |
34 | AdminReserveKbytes int64 // /proc/sys/vm/admin_reserve_kbytes | 34 | AdminReserveKbytes *int64 // /proc/sys/vm/admin_reserve_kbytes |
35 | BlockDump int64 // /proc/sys/vm/block_dump | 35 | BlockDump *int64 // /proc/sys/vm/block_dump |
36 | CompactUnevictableAllowed int64 // /proc/sys/vm/compact_unevictable_allowed | 36 | CompactUnevictableAllowed *int64 // /proc/sys/vm/compact_unevictable_allowed |
37 | DirtyBackgroundBytes int64 // /proc/sys/vm/dirty_background_bytes | 37 | DirtyBackgroundBytes *int64 // /proc/sys/vm/dirty_background_bytes |
38 | DirtyBackgroundRatio int64 // /proc/sys/vm/dirty_background_ratio | 38 | DirtyBackgroundRatio *int64 // /proc/sys/vm/dirty_background_ratio |
39 | DirtyBytes int64 // /proc/sys/vm/dirty_bytes | 39 | DirtyBytes *int64 // /proc/sys/vm/dirty_bytes |
40 | DirtyExpireCentisecs int64 // /proc/sys/vm/dirty_expire_centisecs | 40 | DirtyExpireCentisecs *int64 // /proc/sys/vm/dirty_expire_centisecs |
41 | DirtyRatio int64 // /proc/sys/vm/dirty_ratio | 41 | DirtyRatio *int64 // /proc/sys/vm/dirty_ratio |
42 | DirtytimeExpireSeconds int64 // /proc/sys/vm/dirtytime_expire_seconds | 42 | DirtytimeExpireSeconds *int64 // /proc/sys/vm/dirtytime_expire_seconds |
43 | DirtyWritebackCentisecs int64 // /proc/sys/vm/dirty_writeback_centisecs | 43 | DirtyWritebackCentisecs *int64 // /proc/sys/vm/dirty_writeback_centisecs |
44 | DropCaches int64 // /proc/sys/vm/drop_caches | 44 | DropCaches *int64 // /proc/sys/vm/drop_caches |
45 | ExtfragThreshold int64 // /proc/sys/vm/extfrag_threshold | 45 | ExtfragThreshold *int64 // /proc/sys/vm/extfrag_threshold |
46 | HugetlbShmGroup int64 // /proc/sys/vm/hugetlb_shm_group | 46 | HugetlbShmGroup *int64 // /proc/sys/vm/hugetlb_shm_group |
47 | LaptopMode int64 // /proc/sys/vm/laptop_mode | 47 | LaptopMode *int64 // /proc/sys/vm/laptop_mode |
48 | LegacyVaLayout int64 // /proc/sys/vm/legacy_va_layout | 48 | LegacyVaLayout *int64 // /proc/sys/vm/legacy_va_layout |
49 | LowmemReserveRatio []int64 // /proc/sys/vm/lowmem_reserve_ratio | 49 | LowmemReserveRatio []*int64 // /proc/sys/vm/lowmem_reserve_ratio |
50 | MaxMapCount int64 // /proc/sys/vm/max_map_count | 50 | MaxMapCount *int64 // /proc/sys/vm/max_map_count |
51 | MemoryFailureEarlyKill int64 // /proc/sys/vm/memory_failure_early_kill | 51 | MemoryFailureEarlyKill *int64 // /proc/sys/vm/memory_failure_early_kill |
52 | MemoryFailureRecovery int64 // /proc/sys/vm/memory_failure_recovery | 52 | MemoryFailureRecovery *int64 // /proc/sys/vm/memory_failure_recovery |
53 | MinFreeKbytes int64 // /proc/sys/vm/min_free_kbytes | 53 | MinFreeKbytes *int64 // /proc/sys/vm/min_free_kbytes |
54 | MinSlabRatio int64 // /proc/sys/vm/min_slab_ratio | 54 | MinSlabRatio *int64 // /proc/sys/vm/min_slab_ratio |
55 | MinUnmappedRatio int64 // /proc/sys/vm/min_unmapped_ratio | 55 | MinUnmappedRatio *int64 // /proc/sys/vm/min_unmapped_ratio |
56 | MmapMinAddr int64 // /proc/sys/vm/mmap_min_addr | 56 | MmapMinAddr *int64 // /proc/sys/vm/mmap_min_addr |
57 | NrHugepages int64 // /proc/sys/vm/nr_hugepages | 57 | NrHugepages *int64 // /proc/sys/vm/nr_hugepages |
58 | NrHugepagesMempolicy int64 // /proc/sys/vm/nr_hugepages_mempolicy | 58 | NrHugepagesMempolicy *int64 // /proc/sys/vm/nr_hugepages_mempolicy |
59 | NrOvercommitHugepages int64 // /proc/sys/vm/nr_overcommit_hugepages | 59 | NrOvercommitHugepages *int64 // /proc/sys/vm/nr_overcommit_hugepages |
60 | NumaStat int64 // /proc/sys/vm/numa_stat | 60 | NumaStat *int64 // /proc/sys/vm/numa_stat |
61 | NumaZonelistOrder string // /proc/sys/vm/numa_zonelist_order | 61 | NumaZonelistOrder string // /proc/sys/vm/numa_zonelist_order |
62 | OomDumpTasks int64 // /proc/sys/vm/oom_dump_tasks | 62 | OomDumpTasks *int64 // /proc/sys/vm/oom_dump_tasks |
63 | OomKillAllocatingTask int64 // /proc/sys/vm/oom_kill_allocating_task | 63 | OomKillAllocatingTask *int64 // /proc/sys/vm/oom_kill_allocating_task |
64 | OvercommitKbytes int64 // /proc/sys/vm/overcommit_kbytes | 64 | OvercommitKbytes *int64 // /proc/sys/vm/overcommit_kbytes |
65 | OvercommitMemory int64 // /proc/sys/vm/overcommit_memory | 65 | OvercommitMemory *int64 // /proc/sys/vm/overcommit_memory |
66 | OvercommitRatio int64 // /proc/sys/vm/overcommit_ratio | 66 | OvercommitRatio *int64 // /proc/sys/vm/overcommit_ratio |
67 | PageCluster int64 // /proc/sys/vm/page-cluster | 67 | PageCluster *int64 // /proc/sys/vm/page-cluster |
68 | PanicOnOom int64 // /proc/sys/vm/panic_on_oom | 68 | PanicOnOom *int64 // /proc/sys/vm/panic_on_oom |
69 | PercpuPagelistFraction int64 // /proc/sys/vm/percpu_pagelist_fraction | 69 | PercpuPagelistFraction *int64 // /proc/sys/vm/percpu_pagelist_fraction |
70 | StatInterval int64 // /proc/sys/vm/stat_interval | 70 | StatInterval *int64 // /proc/sys/vm/stat_interval |
71 | Swappiness int64 // /proc/sys/vm/swappiness | 71 | Swappiness *int64 // /proc/sys/vm/swappiness |
72 | UserReserveKbytes int64 // /proc/sys/vm/user_reserve_kbytes | 72 | UserReserveKbytes *int64 // /proc/sys/vm/user_reserve_kbytes |
73 | VfsCachePressure int64 // /proc/sys/vm/vfs_cache_pressure | 73 | VfsCachePressure *int64 // /proc/sys/vm/vfs_cache_pressure |
74 | WatermarkBoostFactor int64 // /proc/sys/vm/watermark_boost_factor | 74 | WatermarkBoostFactor *int64 // /proc/sys/vm/watermark_boost_factor |
75 | WatermarkScaleFactor int64 // /proc/sys/vm/watermark_scale_factor | 75 | WatermarkScaleFactor *int64 // /proc/sys/vm/watermark_scale_factor |
76 | ZoneReclaimMode int64 // /proc/sys/vm/zone_reclaim_mode | 76 | ZoneReclaimMode *int64 // /proc/sys/vm/zone_reclaim_mode |
77 | } | 77 | } |
78 | 78 | ||
79 | // VM reads the VM statistics from the specified `proc` filesystem. | 79 | // VM reads the VM statistics from the specified `proc` filesystem. |
@@ -109,97 +109,97 @@ func (fs FS) VM() (*VM, error) { | |||
109 | 109 | ||
110 | switch f.Name() { | 110 | switch f.Name() { |
111 | case "admin_reserve_kbytes": | 111 | case "admin_reserve_kbytes": |
112 | vm.AdminReserveKbytes = *vp.PInt64() | 112 | vm.AdminReserveKbytes = vp.PInt64() |
113 | case "block_dump": | 113 | case "block_dump": |
114 | vm.BlockDump = *vp.PInt64() | 114 | vm.BlockDump = vp.PInt64() |
115 | case "compact_unevictable_allowed": | 115 | case "compact_unevictable_allowed": |
116 | vm.CompactUnevictableAllowed = *vp.PInt64() | 116 | vm.CompactUnevictableAllowed = vp.PInt64() |
117 | case "dirty_background_bytes": | 117 | case "dirty_background_bytes": |
118 | vm.DirtyBackgroundBytes = *vp.PInt64() | 118 | vm.DirtyBackgroundBytes = vp.PInt64() |
119 | case "dirty_background_ratio": | 119 | case "dirty_background_ratio": |
120 | vm.DirtyBackgroundRatio = *vp.PInt64() | 120 | vm.DirtyBackgroundRatio = vp.PInt64() |
121 | case "dirty_bytes": | 121 | case "dirty_bytes": |
122 | vm.DirtyBytes = *vp.PInt64() | 122 | vm.DirtyBytes = vp.PInt64() |
123 | case "dirty_expire_centisecs": | 123 | case "dirty_expire_centisecs": |
124 | vm.DirtyExpireCentisecs = *vp.PInt64() | 124 | vm.DirtyExpireCentisecs = vp.PInt64() |
125 | case "dirty_ratio": | 125 | case "dirty_ratio": |
126 | vm.DirtyRatio = *vp.PInt64() | 126 | vm.DirtyRatio = vp.PInt64() |
127 | case "dirtytime_expire_seconds": | 127 | case "dirtytime_expire_seconds": |
128 | vm.DirtytimeExpireSeconds = *vp.PInt64() | 128 | vm.DirtytimeExpireSeconds = vp.PInt64() |
129 | case "dirty_writeback_centisecs": | 129 | case "dirty_writeback_centisecs": |
130 | vm.DirtyWritebackCentisecs = *vp.PInt64() | 130 | vm.DirtyWritebackCentisecs = vp.PInt64() |
131 | case "drop_caches": | 131 | case "drop_caches": |
132 | vm.DropCaches = *vp.PInt64() | 132 | vm.DropCaches = vp.PInt64() |
133 | case "extfrag_threshold": | 133 | case "extfrag_threshold": |
134 | vm.ExtfragThreshold = *vp.PInt64() | 134 | vm.ExtfragThreshold = vp.PInt64() |
135 | case "hugetlb_shm_group": | 135 | case "hugetlb_shm_group": |
136 | vm.HugetlbShmGroup = *vp.PInt64() | 136 | vm.HugetlbShmGroup = vp.PInt64() |
137 | case "laptop_mode": | 137 | case "laptop_mode": |
138 | vm.LaptopMode = *vp.PInt64() | 138 | vm.LaptopMode = vp.PInt64() |
139 | case "legacy_va_layout": | 139 | case "legacy_va_layout": |
140 | vm.LegacyVaLayout = *vp.PInt64() | 140 | vm.LegacyVaLayout = vp.PInt64() |
141 | case "lowmem_reserve_ratio": | 141 | case "lowmem_reserve_ratio": |
142 | stringSlice := strings.Fields(value) | 142 | stringSlice := strings.Fields(value) |
143 | int64Slice := make([]int64, 0, len(stringSlice)) | 143 | pint64Slice := make([]*int64, 0, len(stringSlice)) |
144 | for _, value := range stringSlice { | 144 | for _, value := range stringSlice { |
145 | vp := util.NewValueParser(value) | 145 | vp := util.NewValueParser(value) |
146 | int64Slice = append(int64Slice, *vp.PInt64()) | 146 | pint64Slice = append(pint64Slice, vp.PInt64()) |
147 | } | 147 | } |
148 | vm.LowmemReserveRatio = int64Slice | 148 | vm.LowmemReserveRatio = pint64Slice |
149 | case "max_map_count": | 149 | case "max_map_count": |
150 | vm.MaxMapCount = *vp.PInt64() | 150 | vm.MaxMapCount = vp.PInt64() |
151 | case "memory_failure_early_kill": | 151 | case "memory_failure_early_kill": |
152 | vm.MemoryFailureEarlyKill = *vp.PInt64() | 152 | vm.MemoryFailureEarlyKill = vp.PInt64() |
153 | case "memory_failure_recovery": | 153 | case "memory_failure_recovery": |
154 | vm.MemoryFailureRecovery = *vp.PInt64() | 154 | vm.MemoryFailureRecovery = vp.PInt64() |
155 | case "min_free_kbytes": | 155 | case "min_free_kbytes": |
156 | vm.MinFreeKbytes = *vp.PInt64() | 156 | vm.MinFreeKbytes = vp.PInt64() |
157 | case "min_slab_ratio": | 157 | case "min_slab_ratio": |
158 | vm.MinSlabRatio = *vp.PInt64() | 158 | vm.MinSlabRatio = vp.PInt64() |
159 | case "min_unmapped_ratio": | 159 | case "min_unmapped_ratio": |
160 | vm.MinUnmappedRatio = *vp.PInt64() | 160 | vm.MinUnmappedRatio = vp.PInt64() |
161 | case "mmap_min_addr": | 161 | case "mmap_min_addr": |
162 | vm.MmapMinAddr = *vp.PInt64() | 162 | vm.MmapMinAddr = vp.PInt64() |
163 | case "nr_hugepages": | 163 | case "nr_hugepages": |
164 | vm.NrHugepages = *vp.PInt64() | 164 | vm.NrHugepages = vp.PInt64() |
165 | case "nr_hugepages_mempolicy": | 165 | case "nr_hugepages_mempolicy": |
166 | vm.NrHugepagesMempolicy = *vp.PInt64() | 166 | vm.NrHugepagesMempolicy = vp.PInt64() |
167 | case "nr_overcommit_hugepages": | 167 | case "nr_overcommit_hugepages": |
168 | vm.NrOvercommitHugepages = *vp.PInt64() | 168 | vm.NrOvercommitHugepages = vp.PInt64() |
169 | case "numa_stat": | 169 | case "numa_stat": |
170 | vm.NumaStat = *vp.PInt64() | 170 | vm.NumaStat = vp.PInt64() |
171 | case "numa_zonelist_order": | 171 | case "numa_zonelist_order": |
172 | vm.NumaZonelistOrder = value | 172 | vm.NumaZonelistOrder = value |
173 | case "oom_dump_tasks": | 173 | case "oom_dump_tasks": |
174 | vm.OomDumpTasks = *vp.PInt64() | 174 | vm.OomDumpTasks = vp.PInt64() |
175 | case "oom_kill_allocating_task": | 175 | case "oom_kill_allocating_task": |
176 | vm.OomKillAllocatingTask = *vp.PInt64() | 176 | vm.OomKillAllocatingTask = vp.PInt64() |
177 | case "overcommit_kbytes": | 177 | case "overcommit_kbytes": |
178 | vm.OvercommitKbytes = *vp.PInt64() | 178 | vm.OvercommitKbytes = vp.PInt64() |
179 | case "overcommit_memory": | 179 | case "overcommit_memory": |
180 | vm.OvercommitMemory = *vp.PInt64() | 180 | vm.OvercommitMemory = vp.PInt64() |
181 | case "overcommit_ratio": | 181 | case "overcommit_ratio": |
182 | vm.OvercommitRatio = *vp.PInt64() | 182 | vm.OvercommitRatio = vp.PInt64() |
183 | case "page-cluster": | 183 | case "page-cluster": |
184 | vm.PageCluster = *vp.PInt64() | 184 | vm.PageCluster = vp.PInt64() |
185 | case "panic_on_oom": | 185 | case "panic_on_oom": |
186 | vm.PanicOnOom = *vp.PInt64() | 186 | vm.PanicOnOom = vp.PInt64() |
187 | case "percpu_pagelist_fraction": | 187 | case "percpu_pagelist_fraction": |
188 | vm.PercpuPagelistFraction = *vp.PInt64() | 188 | vm.PercpuPagelistFraction = vp.PInt64() |
189 | case "stat_interval": | 189 | case "stat_interval": |
190 | vm.StatInterval = *vp.PInt64() | 190 | vm.StatInterval = vp.PInt64() |
191 | case "swappiness": | 191 | case "swappiness": |
192 | vm.Swappiness = *vp.PInt64() | 192 | vm.Swappiness = vp.PInt64() |
193 | case "user_reserve_kbytes": | 193 | case "user_reserve_kbytes": |
194 | vm.UserReserveKbytes = *vp.PInt64() | 194 | vm.UserReserveKbytes = vp.PInt64() |
195 | case "vfs_cache_pressure": | 195 | case "vfs_cache_pressure": |
196 | vm.VfsCachePressure = *vp.PInt64() | 196 | vm.VfsCachePressure = vp.PInt64() |
197 | case "watermark_boost_factor": | 197 | case "watermark_boost_factor": |
198 | vm.WatermarkBoostFactor = *vp.PInt64() | 198 | vm.WatermarkBoostFactor = vp.PInt64() |
199 | case "watermark_scale_factor": | 199 | case "watermark_scale_factor": |
200 | vm.WatermarkScaleFactor = *vp.PInt64() | 200 | vm.WatermarkScaleFactor = vp.PInt64() |
201 | case "zone_reclaim_mode": | 201 | case "zone_reclaim_mode": |
202 | vm.ZoneReclaimMode = *vp.PInt64() | 202 | vm.ZoneReclaimMode = vp.PInt64() |
203 | } | 203 | } |
204 | if err := vp.Err(); err != nil { | 204 | if err := vp.Err(); err != nil { |
205 | return nil, err | 205 | return nil, err |
diff --git a/vendor/github.com/prometheus/procfs/xfs/parse.go b/vendor/github.com/prometheus/procfs/xfs/parse.go index b3d8634..9781446 100644 --- a/vendor/github.com/prometheus/procfs/xfs/parse.go +++ b/vendor/github.com/prometheus/procfs/xfs/parse.go | |||
@@ -35,23 +35,25 @@ func ParseStats(r io.Reader) (*Stats, error) { | |||
35 | fieldTrans = "trans" | 35 | fieldTrans = "trans" |
36 | fieldIg = "ig" | 36 | fieldIg = "ig" |
37 | fieldLog = "log" | 37 | fieldLog = "log" |
38 | fieldPushAil = "push_ail" | ||
39 | fieldXstrat = "xstrat" | ||
38 | fieldRw = "rw" | 40 | fieldRw = "rw" |
39 | fieldAttr = "attr" | 41 | fieldAttr = "attr" |
40 | fieldIcluster = "icluster" | 42 | fieldIcluster = "icluster" |
41 | fieldVnodes = "vnodes" | 43 | fieldVnodes = "vnodes" |
42 | fieldBuf = "buf" | 44 | fieldBuf = "buf" |
43 | fieldXpc = "xpc" | 45 | fieldXpc = "xpc" |
44 | 46 | fieldAbtb2 = "abtb2" | |
47 | fieldAbtc2 = "abtc2" | ||
48 | fieldBmbt2 = "bmbt2" | ||
49 | fieldIbt2 = "ibt2" | ||
50 | //fieldFibt2 = "fibt2" | ||
51 | fieldQm = "qm" | ||
52 | fieldDebug = "debug" | ||
45 | // Unimplemented at this time due to lack of documentation. | 53 | // Unimplemented at this time due to lack of documentation. |
46 | // fieldPushAil = "push_ail" | 54 | //fieldRmapbt = "rmapbt" |
47 | // fieldXstrat = "xstrat" | 55 | //fieldRefcntbt = "refcntbt" |
48 | // fieldAbtb2 = "abtb2" | 56 | |
49 | // fieldAbtc2 = "abtc2" | ||
50 | // fieldBmbt2 = "bmbt2" | ||
51 | // fieldIbt2 = "ibt2" | ||
52 | // fieldFibt2 = "fibt2" | ||
53 | // fieldQm = "qm" | ||
54 | // fieldDebug = "debug" | ||
55 | ) | 57 | ) |
56 | 58 | ||
57 | var xfss Stats | 59 | var xfss Stats |
@@ -115,6 +117,23 @@ func ParseStats(r io.Reader) (*Stats, error) { | |||
115 | xfss.Vnode, err = vnodeStats(us) | 117 | xfss.Vnode, err = vnodeStats(us) |
116 | case fieldBuf: | 118 | case fieldBuf: |
117 | xfss.Buffer, err = bufferStats(us) | 119 | xfss.Buffer, err = bufferStats(us) |
120 | case fieldPushAil: | ||
121 | xfss.PushAil, err = pushAilStats(us) | ||
122 | case fieldXstrat: | ||
123 | xfss.Xstrat, err = xStratStats(us) | ||
124 | case fieldAbtb2: | ||
125 | xfss.BtreeAllocBlocks2, err = btreeAllocBlocks2Stats(us) | ||
126 | case fieldAbtc2: | ||
127 | xfss.BtreeAllocContig2, err = btreeAllocContig2Stats(us) | ||
128 | case fieldBmbt2: | ||
129 | xfss.BtreeBlockMap2, err = btreeBlockMap2Stats(us) | ||
130 | case fieldIbt2: | ||
131 | xfss.BtreeInode2, err = btreeInode2Stats(us) | ||
132 | //case fieldFibt2: | ||
133 | case fieldQm: | ||
134 | xfss.QuotaManager, err = quotaManagerStats(us) | ||
135 | case fieldDebug: | ||
136 | xfss.Debug, err = debugStats(us) | ||
118 | } | 137 | } |
119 | if err != nil { | 138 | if err != nil { |
120 | return nil, err | 139 | return nil, err |
@@ -228,7 +247,39 @@ func logOperationStats(us []uint32) (LogOperationStats, error) { | |||
228 | }, nil | 247 | }, nil |
229 | } | 248 | } |
230 | 249 | ||
231 | // ReadWriteStats builds a ReadWriteStats from a slice of uint32s. | 250 | // push_ail |
251 | func pushAilStats(us []uint32) (PushAilStats, error) { | ||
252 | if l := len(us); l != 10 { | ||
253 | return PushAilStats{}, fmt.Errorf("incorrect number of values for XFS push ail stats: %d", l) | ||
254 | } | ||
255 | |||
256 | return PushAilStats{ | ||
257 | TryLogspace: us[0], | ||
258 | SleepLogspace: us[1], | ||
259 | Pushes: us[2], | ||
260 | Success: us[3], | ||
261 | PushBuf: us[4], | ||
262 | Pinned: us[5], | ||
263 | Locked: us[6], | ||
264 | Flushing: us[7], | ||
265 | Restarts: us[8], | ||
266 | Flush: us[9], | ||
267 | }, nil | ||
268 | } | ||
269 | |||
270 | // xstrat | ||
271 | func xStratStats(us []uint32) (XstratStats, error) { | ||
272 | if l := len(us); l != 2 { | ||
273 | return XstratStats{}, fmt.Errorf("incorrect number of values for XFS xstrat stats: %d", l) | ||
274 | } | ||
275 | |||
276 | return XstratStats{ | ||
277 | Quick: us[0], | ||
278 | Split: us[1], | ||
279 | }, nil | ||
280 | } | ||
281 | |||
282 | // rw | ||
232 | func readWriteStats(us []uint32) (ReadWriteStats, error) { | 283 | func readWriteStats(us []uint32) (ReadWriteStats, error) { |
233 | if l := len(us); l != 2 { | 284 | if l := len(us); l != 2 { |
234 | return ReadWriteStats{}, fmt.Errorf("incorrect number of values for XFS read write stats: %d", l) | 285 | return ReadWriteStats{}, fmt.Errorf("incorrect number of values for XFS read write stats: %d", l) |
@@ -328,3 +379,130 @@ func extendedPrecisionStats(us []uint64) (ExtendedPrecisionStats, error) { | |||
328 | ReadBytes: us[2], | 379 | ReadBytes: us[2], |
329 | }, nil | 380 | }, nil |
330 | } | 381 | } |
382 | |||
383 | func quotaManagerStats(us []uint32) (QuotaManagerStats, error) { | ||
384 | if l := len(us); l != 8 { | ||
385 | return QuotaManagerStats{}, fmt.Errorf("incorrect number of values for XFS quota stats: %d", l) | ||
386 | } | ||
387 | |||
388 | return QuotaManagerStats{ | ||
389 | Reclaims: us[0], | ||
390 | ReclaimMisses: us[1], | ||
391 | DquoteDups: us[2], | ||
392 | CacheMisses: us[3], | ||
393 | CacheHits: us[4], | ||
394 | Wants: us[5], | ||
395 | ShakeReclaims: us[6], | ||
396 | InactReclaims: us[7], | ||
397 | }, nil | ||
398 | } | ||
399 | |||
400 | func debugStats(us []uint32) (DebugStats, error) { | ||
401 | if l := len(us); l != 1 { | ||
402 | return DebugStats{}, fmt.Errorf("incorrect number of values for XFS debug stats: %d", l) | ||
403 | } | ||
404 | |||
405 | return DebugStats{ | ||
406 | Enabled: us[0], | ||
407 | }, nil | ||
408 | } | ||
409 | |||
410 | // abtb2 | ||
411 | func btreeAllocBlocks2Stats(us []uint32) (BtreeAllocBlocks2Stats, error) { | ||
412 | if l := len(us); l != 15 { | ||
413 | return BtreeAllocBlocks2Stats{}, fmt.Errorf("incorrect number of values for abtb2 stats: %d", 1) | ||
414 | } | ||
415 | |||
416 | return BtreeAllocBlocks2Stats{ | ||
417 | Lookup: us[0], | ||
418 | Compare: us[1], | ||
419 | Insrec: us[2], | ||
420 | Delrec: us[3], | ||
421 | NewRoot: us[4], | ||
422 | KillRoot: us[5], | ||
423 | Increment: us[6], | ||
424 | Decrement: us[7], | ||
425 | Lshift: us[8], | ||
426 | Rshift: us[9], | ||
427 | Split: us[10], | ||
428 | Join: us[11], | ||
429 | Alloc: us[12], | ||
430 | Free: us[13], | ||
431 | Moves: us[14], | ||
432 | }, nil | ||
433 | } | ||
434 | |||
435 | // abtc2 | ||
436 | func btreeAllocContig2Stats(us []uint32) (BtreeAllocContig2Stats, error) { | ||
437 | if l := len(us); l != 15 { | ||
438 | return BtreeAllocContig2Stats{}, fmt.Errorf("incorrect number of values for abtc2 stats: %d", 1) | ||
439 | } | ||
440 | |||
441 | return BtreeAllocContig2Stats{ | ||
442 | Lookup: us[0], | ||
443 | Compare: us[1], | ||
444 | Insrec: us[2], | ||
445 | Delrec: us[3], | ||
446 | NewRoot: us[4], | ||
447 | KillRoot: us[5], | ||
448 | Increment: us[6], | ||
449 | Decrement: us[7], | ||
450 | Lshift: us[8], | ||
451 | Rshift: us[9], | ||
452 | Split: us[10], | ||
453 | Join: us[11], | ||
454 | Alloc: us[12], | ||
455 | Free: us[13], | ||
456 | Moves: us[14], | ||
457 | }, nil | ||
458 | } | ||
459 | |||
460 | // bmbt2 | ||
461 | func btreeBlockMap2Stats(us []uint32) (BtreeBlockMap2Stats, error) { | ||
462 | if l := len(us); l != 15 { | ||
463 | return BtreeBlockMap2Stats{}, fmt.Errorf("incorrect number of values for bmbt2 stats: %d", 1) | ||
464 | } | ||
465 | |||
466 | return BtreeBlockMap2Stats{ | ||
467 | Lookup: us[0], | ||
468 | Compare: us[1], | ||
469 | Insrec: us[2], | ||
470 | Delrec: us[3], | ||
471 | NewRoot: us[4], | ||
472 | KillRoot: us[5], | ||
473 | Increment: us[6], | ||
474 | Decrement: us[7], | ||
475 | Lshift: us[8], | ||
476 | Rshift: us[9], | ||
477 | Split: us[10], | ||
478 | Join: us[11], | ||
479 | Alloc: us[12], | ||
480 | Free: us[13], | ||
481 | Moves: us[14], | ||
482 | }, nil | ||
483 | } | ||
484 | |||
485 | // ibt2 | ||
486 | func btreeInode2Stats(us []uint32) (BtreeInode2Stats, error) { | ||
487 | if l := len(us); l != 15 { | ||
488 | return BtreeInode2Stats{}, fmt.Errorf("incorrect number of values for ibt2 stats: %d", 1) | ||
489 | } | ||
490 | |||
491 | return BtreeInode2Stats{ | ||
492 | Lookup: us[0], | ||
493 | Compare: us[1], | ||
494 | Insrec: us[2], | ||
495 | Delrec: us[3], | ||
496 | NewRoot: us[4], | ||
497 | KillRoot: us[5], | ||
498 | Increment: us[6], | ||
499 | Decrement: us[7], | ||
500 | Lshift: us[8], | ||
501 | Rshift: us[9], | ||
502 | Split: us[10], | ||
503 | Join: us[11], | ||
504 | Alloc: us[12], | ||
505 | Free: us[13], | ||
506 | Moves: us[14], | ||
507 | }, nil | ||
508 | } | ||
diff --git a/vendor/github.com/prometheus/procfs/xfs/xfs.go b/vendor/github.com/prometheus/procfs/xfs/xfs.go index 3aad661..018a0b8 100644 --- a/vendor/github.com/prometheus/procfs/xfs/xfs.go +++ b/vendor/github.com/prometheus/procfs/xfs/xfs.go | |||
@@ -49,6 +49,14 @@ type Stats struct { | |||
49 | Vnode VnodeStats | 49 | Vnode VnodeStats |
50 | Buffer BufferStats | 50 | Buffer BufferStats |
51 | ExtendedPrecision ExtendedPrecisionStats | 51 | ExtendedPrecision ExtendedPrecisionStats |
52 | Xstrat XstratStats // xstrat | ||
53 | PushAil PushAilStats // push_ail | ||
54 | Debug DebugStats // debug | ||
55 | QuotaManager QuotaManagerStats // qm | ||
56 | BtreeAllocBlocks2 BtreeAllocBlocks2Stats // abtb2 | ||
57 | BtreeAllocContig2 BtreeAllocContig2Stats // abtc2 | ||
58 | BtreeBlockMap2 BtreeBlockMap2Stats // bmbt2 | ||
59 | BtreeInode2 BtreeInode2Stats // ibt2 | ||
52 | } | 60 | } |
53 | 61 | ||
54 | // ExtentAllocationStats contains statistics regarding XFS extent allocations. | 62 | // ExtentAllocationStats contains statistics regarding XFS extent allocations. |
@@ -170,6 +178,119 @@ type ExtendedPrecisionStats struct { | |||
170 | ReadBytes uint64 | 178 | ReadBytes uint64 |
171 | } | 179 | } |
172 | 180 | ||
181 | // PushAilStats contains statistics on tail-pushing operations. | ||
182 | type PushAilStats struct { | ||
183 | TryLogspace uint32 | ||
184 | SleepLogspace uint32 | ||
185 | Pushes uint32 | ||
186 | Success uint32 | ||
187 | PushBuf uint32 | ||
188 | Pinned uint32 | ||
189 | Locked uint32 | ||
190 | Flushing uint32 | ||
191 | Restarts uint32 | ||
192 | Flush uint32 | ||
193 | } | ||
194 | |||
195 | // QuotaManagerStats contain statistics regarding quota processing. | ||
196 | type QuotaManagerStats struct { | ||
197 | Reclaims uint32 | ||
198 | ReclaimMisses uint32 | ||
199 | DquoteDups uint32 | ||
200 | CacheMisses uint32 | ||
201 | CacheHits uint32 | ||
202 | Wants uint32 | ||
203 | ShakeReclaims uint32 | ||
204 | InactReclaims uint32 | ||
205 | } | ||
206 | |||
207 | // XstratStats contains statistics regarding bytes processed by the XFS daemon. | ||
208 | type XstratStats struct { | ||
209 | Quick uint32 | ||
210 | Split uint32 | ||
211 | } | ||
212 | |||
213 | // DebugStats indicate if XFS debugging is enabled. | ||
214 | type DebugStats struct { | ||
215 | Enabled uint32 | ||
216 | } | ||
217 | |||
218 | // BtreeAllocBlocks2Stats contains statistics on B-Tree v2 allocations. | ||
219 | type BtreeAllocBlocks2Stats struct { | ||
220 | Lookup uint32 | ||
221 | Compare uint32 | ||
222 | Insrec uint32 | ||
223 | Delrec uint32 | ||
224 | NewRoot uint32 | ||
225 | KillRoot uint32 | ||
226 | Increment uint32 | ||
227 | Decrement uint32 | ||
228 | Lshift uint32 | ||
229 | Rshift uint32 | ||
230 | Split uint32 | ||
231 | Join uint32 | ||
232 | Alloc uint32 | ||
233 | Free uint32 | ||
234 | Moves uint32 | ||
235 | } | ||
236 | |||
237 | // BtreeAllocContig2Stats contain statistics on B-tree v2 free-space-by-size record operations. | ||
238 | type BtreeAllocContig2Stats struct { | ||
239 | Lookup uint32 | ||
240 | Compare uint32 | ||
241 | Insrec uint32 | ||
242 | Delrec uint32 | ||
243 | NewRoot uint32 | ||
244 | KillRoot uint32 | ||
245 | Increment uint32 | ||
246 | Decrement uint32 | ||
247 | Lshift uint32 | ||
248 | Rshift uint32 | ||
249 | Split uint32 | ||
250 | Join uint32 | ||
251 | Alloc uint32 | ||
252 | Free uint32 | ||
253 | Moves uint32 | ||
254 | } | ||
255 | |||
256 | // BtreeBlockMap2Stats contain statistics on B-tree v2 block map operations. | ||
257 | type BtreeBlockMap2Stats struct { | ||
258 | Lookup uint32 | ||
259 | Compare uint32 | ||
260 | Insrec uint32 | ||
261 | Delrec uint32 | ||
262 | NewRoot uint32 | ||
263 | KillRoot uint32 | ||
264 | Increment uint32 | ||
265 | Decrement uint32 | ||
266 | Lshift uint32 | ||
267 | Rshift uint32 | ||
268 | Split uint32 | ||
269 | Join uint32 | ||
270 | Alloc uint32 | ||
271 | Free uint32 | ||
272 | Moves uint32 | ||
273 | } | ||
274 | |||
275 | // BtreeInode2Stats contain statistics on B-tree v2 inode allocations. | ||
276 | type BtreeInode2Stats struct { | ||
277 | Lookup uint32 | ||
278 | Compare uint32 | ||
279 | Insrec uint32 | ||
280 | Delrec uint32 | ||
281 | NewRoot uint32 | ||
282 | KillRoot uint32 | ||
283 | Increment uint32 | ||
284 | Decrement uint32 | ||
285 | Lshift uint32 | ||
286 | Rshift uint32 | ||
287 | Split uint32 | ||
288 | Join uint32 | ||
289 | Alloc uint32 | ||
290 | Free uint32 | ||
291 | Moves uint32 | ||
292 | } | ||
293 | |||
173 | // FS represents the pseudo-filesystems proc and sys, which provides an interface to | 294 | // FS represents the pseudo-filesystems proc and sys, which provides an interface to |
174 | // kernel data structures. | 295 | // kernel data structures. |
175 | type FS struct { | 296 | type FS struct { |
diff --git a/vendor/modules.txt b/vendor/modules.txt index b800abc..a74d6d7 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt | |||
@@ -45,7 +45,7 @@ github.com/prometheus/common/version | |||
45 | github.com/prometheus/common/expfmt | 45 | github.com/prometheus/common/expfmt |
46 | github.com/prometheus/common/model | 46 | github.com/prometheus/common/model |
47 | github.com/prometheus/common/internal/bitbucket.org/ww/goautoneg | 47 | github.com/prometheus/common/internal/bitbucket.org/ww/goautoneg |
48 | # github.com/prometheus/procfs v0.0.4-0.20190731153504-5da962fa40f1 | 48 | # github.com/prometheus/procfs v0.0.4 |
49 | github.com/prometheus/procfs | 49 | github.com/prometheus/procfs |
50 | github.com/prometheus/procfs/bcache | 50 | github.com/prometheus/procfs/bcache |
51 | github.com/prometheus/procfs/nfs | 51 | github.com/prometheus/procfs/nfs |