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

Driftmanager + rebase #73

Merged
merged 52 commits into from
Nov 28, 2023
Merged

Driftmanager + rebase #73

merged 52 commits into from
Nov 28, 2023

Conversation

whitej6
Copy link
Contributor

@whitej6 whitej6 commented Nov 27, 2023

Combines #69 & #70 into one PR

snaselj and others added 30 commits October 25, 2023 07:42
Template:

```
{
    "template": "https://github.com/nautobot/cookiecutter-nautobot-app.git",
    "dir": "nautobot-app",
    "ref": "develop",
    "path": null
}
```

Cookie:

```
{
    "remote": "https://github.com/nautobot/nautobot-plugin-capacity-metrics.git",
    "path": "/opt/ntc/drift-manager/outputs/nautobot-plugin-capacity-metrics",
    "repository_path": "/opt/ntc/drift-manager/outputs/nautobot-plugin-capacity-metrics",
    "dir": "",
    "branch_prefix": "drift-manager",
    "context": {
        "codeowner_github_usernames": "@nautobot/po-tl-telemetry",
        "full_name": "Network to Code, LLC",
        "email": "[email protected]",
        "github_org": "nautobot",
        "plugin_name": "nautobot_capacity_metrics",
        "verbose_name": "Metrics & Monitoring Extension Plugin",
        "plugin_slug": "nautobot-capacity-metrics",
        "project_slug": "nautobot-plugin-capacity-metrics",
        "repo_url": "https://github.com/nautobot/nautobot-plugin-capacity-metrics",
        "base_url": "capacity-metrics",
        "min_nautobot_version": "2.0.0",
        "max_nautobot_version": "2.9999",
        "camel_name": "NautobotCapacityMetrics",
        "project_short_description": "Plugin to improve the instrumentation of Nautobot and expose additional metrics (Application Metrics, RQ Worker).",
        "model_class_name": "None",
        "open_source_license": "Apache-2.0",
        "docs_base_url": "https://docs.nautobot.com",
        "docs_app_url": "https://docs.nautobot.com/projects/capacity-metrics/en/latest",
        "_template": "https://github.com/nautobot/cookiecutter-nautobot-app.git",
        "_output_dir": "/opt/ntc/drift-manager/outputs",
        "_repo_dir": "/home/jsn/.cookiecutters/cookiecutter-nautobot-app/nautobot-app",
        "_checkout": "develop"
    },
    "base_branch": "develop",
    "remote_name": "origin",
    "pull_request_strategy": "PullRequestStrategy.CREATE",
    "post_actions": [
        "PostAction.BLACK"
    ],
    "baked_commit_ref": "",
    "draft": true
}
```

CLI Arguments:

```
{
    "cookie_dir": "",
    "input": false,
    "json_filename": "setup-cookie-capacity-metrics.json",
    "output_dir": "./outputs",
    "push": true,
    "template": "https://github.com/nautobot/cookiecutter-nautobot-app.git",
    "template_dir": "nautobot-app",
    "template_ref": "develop",
    "pull_request": null,
    "post_action": [
        "black"
    ],
    "disable_post_actions": false,
    "draft": true
}
```
* Add a metric for software versions.

* Make presence of plugin versions in metrics configurable.

* Update documentation and turn version metrics off by default.

* Fix docs.
* [NCLOUD-926] Add screenshots

* [NCLOUD-926] Link screenshots in docs

---------

Co-authored-by: Daria Sienkiewicz <“[email protected]”>
* fix: Align versions

* fix: Stick on RC
smk4664 and others added 12 commits November 27, 2023 09:22
Also temporarily dropping the constraints in order to not use the 2.0.0 Nautobot container that doesn't exist.
* Fix CI issues.

* Remove stable as that is now 2.0.0

---------

Co-authored-by: Glenn Matthews <[email protected]>
Template:

```
{
    "template": "https://github.com/nautobot/cookiecutter-nautobot-app.git",
    "dir": "nautobot-app",
    "ref": "develop",
    "path": null
}
```

Cookie:

```
{
    "remote": "https://github.com/nautobot/nautobot-plugin-capacity-metrics.git",
    "path": "/opt/ntc/drift-manager/outputs/nautobot-plugin-capacity-metrics",
    "repository_path": "/opt/ntc/drift-manager/outputs/nautobot-plugin-capacity-metrics",
    "dir": "",
    "branch_prefix": "drift-manager",
    "context": {
        "codeowner_github_usernames": "@nautobot/po-tl-telemetry",
        "full_name": "Network to Code, LLC",
        "email": "[email protected]",
        "github_org": "nautobot",
        "plugin_name": "nautobot_capacity_metrics",
        "verbose_name": "Metrics & Monitoring Extension Plugin",
        "plugin_slug": "nautobot-capacity-metrics",
        "project_slug": "nautobot-plugin-capacity-metrics",
        "repo_url": "https://github.com/nautobot/nautobot-plugin-capacity-metrics",
        "base_url": "capacity-metrics",
        "min_nautobot_version": "2.0.0",
        "max_nautobot_version": "2.9999",
        "camel_name": "NautobotCapacityMetrics",
        "project_short_description": "Plugin to improve the instrumentation of Nautobot and expose additional metrics (Application Metrics, RQ Worker).",
        "model_class_name": "None",
        "open_source_license": "Apache-2.0",
        "docs_base_url": "https://docs.nautobot.com",
        "docs_app_url": "https://docs.nautobot.com/projects/capacity-metrics/en/latest",
        "_template": "https://github.com/nautobot/cookiecutter-nautobot-app.git",
        "_output_dir": "/opt/ntc/drift-manager/outputs",
        "_repo_dir": "/home/jsn/.cookiecutters/cookiecutter-nautobot-app/nautobot-app",
        "_checkout": "develop"
    },
    "base_branch": "develop",
    "remote_name": "origin",
    "pull_request_strategy": "PullRequestStrategy.CREATE",
    "post_actions": [
        "PostAction.BLACK"
    ],
    "baked_commit_ref": "",
    "draft": true
}
```

CLI Arguments:

```
{
    "cookie_dir": "",
    "input": false,
    "json_filename": "setup-cookie-capacity-metrics.json",
    "output_dir": "./outputs",
    "push": true,
    "template": "https://github.com/nautobot/cookiecutter-nautobot-app.git",
    "template_dir": "nautobot-app",
    "template_ref": "develop",
    "pull_request": null,
    "post_action": [
        "black"
    ],
    "disable_post_actions": false,
    "draft": true
}
```
@whitej6 whitej6 requested a review from a team as a code owner November 27, 2023 15:32
Copy link
Contributor

@smk4664 smk4664 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just some minor suggestions.

mkdocs.yml Show resolved Hide resolved
docs/dev/contributing.md Outdated Show resolved Hide resolved
docs/dev/contributing.md Outdated Show resolved Hide resolved
docs/dev/extending.md Outdated Show resolved Hide resolved
docs/admin/release_notes/version_2.0.md Outdated Show resolved Hide resolved
Copy link
Contributor

@Kircheneer Kircheneer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

whitej6 and others added 5 commits November 28, 2023 07:38
Copy link
Contributor

@smk4664 smk4664 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for making the Changes!

@whitej6 whitej6 merged commit db7ace2 into develop Nov 28, 2023
14 checks passed
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.

9 participants